Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix Koschei OpenID auth on staging

Browse source
This commit is contained in:
Mikolaj Izdebski 2016-05-13 15:41:35 +00:00
parent 64c13b8106
commit 9949c28743
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/koschei/frontend/templates/config-frontend.cfg.j2
View file

@ -62,6 +62,9 @@ config = {
}, },
"frontend": { "frontend": {
"auto_tracking": True, "auto_tracking": True,
"auth": {
"user_re": "http://(.+)\\.id{{ env_prefix }}\\.fedoraproject\\.org/",
},
{% if env == 'staging' %} {% if env == 'staging' %}
# Staging copies for fedmenu # Staging copies for fedmenu
"fedmenu_url": "https://apps.stg.fedoraproject.org/fedmenu", "fedmenu_url": "https://apps.stg.fedoraproject.org/fedmenu",

5
roles/koschei/frontend/templates/httpd.conf.j2
View file

@ -17,10 +17,13 @@
</Directory> </Directory>
{% if env == 'staging' %} {% if env == 'staging' %}
<Location /login> <Location /koschei/login>
Require valid-user Require valid-user
AuthType OpenID AuthType OpenID
AuthOpenIDSingleIdP https://{{ koschei_openid_provider }}/ AuthOpenIDSingleIdP https://{{ koschei_openid_provider }}/
AuthOpenIDServerName https://apps{{ env_prefix }}.fedoraproject.org
AuthOpenIDTrustRoot https://apps{{ env_prefix }}.fedoraproject.org/koschei/
AuthOpenIDSecureCookie on
</Location> </Location>
{% endif %} {% endif %}
</VirtualHost> </VirtualHost>