From 3c16c8b240346cfc12382b9a6c2bb893690e3dfd Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Thu, 24 Nov 2016 18:37:32 +0000
Subject: [PATCH] Someone else also got annoyed by .stg all over the place

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 roles/ipsilon/templates/configuration.conf | 30 ++++++----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/roles/ipsilon/templates/configuration.conf b/roles/ipsilon/templates/configuration.conf
index ae9450501b..d61bfbe0a6 100644
--- a/roles/ipsilon/templates/configuration.conf
+++ b/roles/ipsilon/templates/configuration.conf
@@ -1,20 +1,12 @@
 [login_config]
 global enabled=gssapi,fas
-{% if env == 'staging' %}
-fas FAS url=https://admin.stg.fedoraproject.org/accounts/
-{% else %}
-fas FAS url=https://admin.fedoraproject.org/accounts/
-{% endif %}
+fas FAS url=https://admin{{env_suffix}}.fedoraproject.org/accounts/
 fas FAS Proxy client user Agent=Fedora Ipsilon
 fas FAS Insecure Auth=False
 
 [info_config]
 global enabled=fas
-{% if env == 'staging' %}
-fas FAS url=https://admin.stg.fedoraproject.org/accounts/
-{% else %}
-fas FAS url=https://admin.fedoraproject.org/accounts/
-{% endif %}
+fas FAS url=https://admin{{env_suffix}}.fedoraproject.org/accounts/
 fas FAS Proxy client user Agent=Fedora Ipsilon
 fas FAS Insecure Auth=False
 fas Bind Username={{ fedoraDummyUser }}
@@ -32,23 +24,19 @@ global enabled=persona,openid,saml2
 
 {% if env == 'staging' %}
 persona allowed domains=stg.fedoraproject.org
-persona issuer domain=id.stg.fedoraproject.org
-persona idp key file=/etc/ipsilon/persona.stg.key
 {% else %}
 persona allowed domains=fedoraproject.org
-persona issuer domain=id.fedoraproject.org
-persona idp key file=/etc/ipsilon/persona.key
 {% endif %}
+persona issuer domain=id{{env_suffix}}.fedoraproject.org
+persona idp key file=/etc/ipsilon/persona{{env_suffix}.key
 
 {% if env == 'staging' %}
-openidc endpoint url=https://id.stg.fedoraproject.org/openidc/
-openidc idp key file=/etc/ipsilon/openidc.stg.key
 openidc subject salt={{ ipsilon_stg_openidc_subject_salt }}
 {% else %}
-openidc endpoint url=https://id.fedoraproject.org/openidc/
-openidc idp key file=/etc/ipsilon/openidc.key
 openidc subject salt={{ ipsilon_openidc_subject_salt }}
 {% endif %}
+openidc endpoint url=https://id{{env_suffix}}.fedoraproject.org/openidc/
+openidc idp key file=/etc/ipsilon/openidc{{env_suffix}}.key
 openidc database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_openid_name }}
 openidc static database url=configfile:///etc/ipsilon/openidc.static.cfg
 openidc enabled extensions=
@@ -59,13 +47,11 @@ openidc idp sig key id=20161031-sig
 openidc allow dynamic client registration=False
 openidc default attribute mapping=[["*", "*"], ["timezone", "zoneinfo"], ["_groups", "groups"], [["_extras", "cla"], "cla"], ["fullname", "name"]]
 
+openid endpoint url=https://id{{env_suffix}}.fedoraproject.org/openid/
+openid identity url template=http://%(username)s.id{{env_suffix}}.fedoraproject.org/
 {% if env == 'staging' %}
-openid endpoint url=https://id.stg.fedoraproject.org/openid/
-openid identity url template=http://%(username)s.id.stg.fedoraproject.org/
 openid trusted roots=
 {% else %}
-openid endpoint url=https://id.fedoraproject.org/openid/
-openid identity url template=http://%(username)s.id.fedoraproject.org/
 openid trusted roots=http://jenkins.fedorainfracloud.org/securityRealm/finishLogin,http://jenkins.cloud.fedoraproject.org/securityRealm/finishLogin,https://ask.fedoraproject.org/,https://fedorahosted.org/,https://badges.fedoraproject.org,https://apps.fedoraproject.org/tagger/,https://apps.fedoraproject.org/nuancier/,https://apps.fedoraproject.org/datagrepper/,https://apps.fedoraproject.org/calendar/,http://apps.fedoraproject.org/notifications/,http://copr.fedoraproject.org/,https://copr.fedoraproject.org/,https://admin.fedoraproject.org/pkgdb/,https://admin.fedoraproject.org/voting/,https://apps.fedoraproject.org/github2fedmsg,https://admin.fedoraproject.org,https://apps.fedoraproject.org/,https://release-monitoring.org/,http://pagure.io/,http://admin.fedoraproject.org/mirrormanager/,https://apps.fedoraproject.org/koschei/,https://bodhi.fedoraproject.org,https://lists.fedoraproject.org/,https://openqa.fedoraproject.org/
 {% endif %}
 openid database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_openid_name }}