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

Prepare Koschei prod config for update to 1.7

Browse source
This commit is contained in:
Mikolaj Izdebski 2016-05-20 13:57:19 +00:00
parent cf9be64ded
commit d1dfbf63b7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/koschei/backend/tasks/main.yml
View file

@ -128,13 +128,11 @@
src=koschei-refresh-group src=koschei-refresh-group
dest=/usr/local/bin/koschei-refresh-group dest=/usr/local/bin/koschei-refresh-group
mode=755 mode=755
when: env == 'staging'
tags: tags:
- koschei - koschei
- name: Copy the group refresh cronjob - name: Copy the group refresh cronjob
template: src=cron-refresh-groups.j2 dest=/etc/cron.d/cron-refresh-groups template: src=cron-refresh-groups.j2 dest=/etc/cron.d/cron-refresh-groups
when: env == 'staging'
tags: tags:
- koschei - koschei
- config - config

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

@ -16,14 +16,17 @@
Require all granted Require all granted
</Directory> </Directory>
{% if env == 'staging' %}
<Location /koschei/login> <Location /koschei/login>
Require valid-user Require valid-user
AuthType OpenID AuthType OpenID
AuthOpenIDSingleIdP https://{{ koschei_openid_provider }}/ AuthOpenIDSingleIdP https://{{ koschei_openid_provider }}/
{% if env == 'staging' %}
AuthOpenIDServerName https://apps.stg.fedoraproject.org AuthOpenIDServerName https://apps.stg.fedoraproject.org
AuthOpenIDTrustRoot https://apps.stg.fedoraproject.org/koschei/ AuthOpenIDTrustRoot https://apps.stg.fedoraproject.org/koschei/
{% else %}
AuthOpenIDServerName https://apps.fedoraproject.org
AuthOpenIDTrustRoot https://apps.fedoraproject.org/koschei/
{% endif %}
AuthOpenIDUseCookie off AuthOpenIDUseCookie off
</Location> </Location>
{% endif %}
</VirtualHost> </VirtualHost>