From 1ecbcd856e6a55205357e0668141b534b4a4759e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 24 Feb 2015 18:03:12 +0000 Subject: [PATCH] s/fedoauth/ipsilon/ --- roles/ipsilon/templates/configuration.cfg | 8 ++++---- roles/ipsilon/templates/ipsilon.cfg | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/ipsilon/templates/configuration.cfg b/roles/ipsilon/templates/configuration.cfg index 72713f9eb5..cae974a9e1 100644 --- a/roles/ipsilon/templates/configuration.cfg +++ b/roles/ipsilon/templates/configuration.cfg @@ -17,20 +17,20 @@ global enabled=persona,openid {% if env == 'staging' %} persona allowed domains=stg.fedoraproject.org persona issuer domain=id.stg.fedoraproject.org -persona idp key file=/etc/fedoauth/persona.stg.key +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/fedoauth/persona.key +persona idp key file=/etc/ipsilon/persona.key {% endif %} {% if env == 'staging' %} -openid database url="postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}.stg/{{ fedoauth_db_name }}" +openid database url="postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}.stg/{{ ipsilon_db_name }}" openid endpoint url=https://id.stg.fedoraproject.org/openid/ openid identity url template=http://localhost/openid/id/%(username)s/ openid trusted roots= {% else %} -openid database url="postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}/{{ fedoauth_db_name }}" +openid database url="postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_name }}" openid endpoint url=https://id.fedoraproject.org/openid/ openid identity url template=http://%(username)s.id.fedoraproject.org/ openid trusted roots=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/,http://copr-fe.cloud.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/ diff --git a/roles/ipsilon/templates/ipsilon.cfg b/roles/ipsilon/templates/ipsilon.cfg index cb0ddfb980..f2ad40818a 100644 --- a/roles/ipsilon/templates/ipsilon.cfg +++ b/roles/ipsilon/templates/ipsilon.cfg @@ -9,9 +9,9 @@ base.dir = "/usr/share/ipsilon" admin.config.db = "configfile:///etc/ipsilon/configuration.cfg" user.prefs.db = "configfile:///etc/ipsilon/configuration.cfg" {% if env == 'staging' %} -transactions.db = "postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}.stg/{{ fedoauth_db_name }}" +transactions.db = "postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}.stg/{{ ipsilon_db_name }}" {% else %} -transactions.db = "postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}/{{ fedoauth_db_name }}" +transactions.db = "postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_name }}" {% endif %} tools.sessions.on = True