Merge lp:~ce-infrastructure/capomastro/deploy-sso into lp:~ubuntuone-hackers/capomastro/deploy

Proposed by Caio Begotti
Status: Merged
Merged at revision: 37
Proposed branch: lp:~ce-infrastructure/capomastro/deploy-sso
Merge into: lp:~ubuntuone-hackers/capomastro/deploy
Diff against target: 9 lines (+1/-1)
1 file modified
config/apache-openid.yaml (+1/-1)
To merge this branch: bzr merge lp:~ce-infrastructure/capomastro/deploy-sso
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+242105@code.launchpad.net

Description of the change

This should go along with the changes of https://code.launchpad.net/~ce-infrastructure/capomastro/charm-sso/+merge/242104 as it is here that we set the OpenID options we'll use. As of now we're allowing users from the CE team as well anyone inside capomastro-users, which don't exist yet but we can be used as a placeholder for when we decide about how to organize the users of the service.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks good and simpler. I didn't find the capomastro-users group in launchpad, but I guess we can create it later. THanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config/apache-openid.yaml'
--- config/apache-openid.yaml 2014-11-12 01:06:20 +0000
+++ config/apache-openid.yaml 2014-11-18 18:37:28 +0000
@@ -1,4 +1,4 @@
1apache-openid:1apache-openid:
2 debug: True2 debug: True
3 allowed_providers: "Launchpad=login.launchpad.net"3 allowed_providers: "Launchpad=login.launchpad.net"
4 allowed-op-list-url: "/etc/apache2/openid-allowed-ops.txt"4 authorized_teams: "ce-infrastructure capomastro-users"

Subscribers

People subscribed via source and target branches