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

Fix use of env_prefix

Browse source
This commit is contained in:
Mikolaj Izdebski 2016-05-13 15:49:06 +00:00
parent 9949c28743
commit d6a08eede3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
# configuration in /usr/share/koschei/config.cfg. It is a python file expecting # configuration in /usr/share/koschei/config.cfg. It is a python file expecting
# assignment to config dictionary which will be recursively merged with the # assignment to config dictionary which will be recursively merged with the
# default one. # default one.
{% set env_prefix = ".stg" if env == "staging" else "" %}
config = { config = {
"database_config": { "database_config": {
"host": "{{ koschei_pgsql_hostname }}", "host": "{{ koschei_pgsql_hostname }}",
@ -80,7 +81,6 @@ config = {
}, },
{% if False %} # this is for > 1.6.1 {% if False %} # this is for > 1.6.1
"links": [ "links": [
{% set env_prefix = ".stg" if env == "staging" else "" %}
{"name": "Packages", {"name": "Packages",
"url": "https://apps{{ env_prefix }}.fedoraproject.org/packages/{package.name}"}, "url": "https://apps{{ env_prefix }}.fedoraproject.org/packages/{package.name}"},
{"name": "PkgDB", {"name": "PkgDB",

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

@ -21,8 +21,8 @@
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 AuthOpenIDServerName https://apps.stg.fedoraproject.org
AuthOpenIDTrustRoot https://apps{{ env_prefix }}.fedoraproject.org/koschei/ AuthOpenIDTrustRoot https://apps.stg.fedoraproject.org/koschei/
AuthOpenIDSecureCookie on AuthOpenIDSecureCookie on
</Location> </Location>
{% endif %} {% endif %}