diff --git a/roles/ipsilon/templates/configuration.cfg b/roles/ipsilon/templates/configuration.cfg index 759b33ce47..1776a9bfa2 100644 --- a/roles/ipsilon/templates/configuration.cfg +++ b/roles/ipsilon/templates/configuration.cfg @@ -25,16 +25,15 @@ persona idp key file=/etc/ipsilon/persona.key {% endif %} {% if env == 'staging' %} -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://{{ 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/ {% endif %} +openid database url=postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_name }} openid untrusted roots= openid enabled extensions=Teams,Attribute Exchange,CLAs,Simple Registration diff --git a/roles/ipsilon/templates/ipsilon.conf b/roles/ipsilon/templates/ipsilon.conf index 0be313f29e..945401e732 100644 --- a/roles/ipsilon/templates/ipsilon.conf +++ b/roles/ipsilon/templates/ipsilon.conf @@ -8,11 +8,7 @@ base.mount = "" base.dir = "/usr/share/ipsilon" admin.config.db = "configfile:///etc/ipsilon/configuration.conf" user.prefs.db = "configfile:///etc/ipsilon/configuration.conf" -{% if env == 'staging' %} -transactions.db = "postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}.stg/{{ ipsilon_db_name }}" -{% else %} transactions.db = "postgresql://{{ ipsilon_db_user }}:{{ ipsilon_db_pass }}@{{ ipsilon_db_host }}/{{ ipsilon_db_name }}" -{% endif %} tools.sessions.on = True tools.sessions.name = "fedora_ipsilon_session_id"