From 997db6c6ba7c709ecb7abeeecf84c17246411330 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 4 Feb 2015 16:50:40 +0000 Subject: [PATCH] Handle deprecation of old config flag for FedOAuth --- roles/fedoauth/templates/fedoauth.cfg | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/roles/fedoauth/templates/fedoauth.cfg b/roles/fedoauth/templates/fedoauth.cfg index 01037b72d4..1de06d83e5 100644 --- a/roles/fedoauth/templates/fedoauth.cfg +++ b/roles/fedoauth/templates/fedoauth.cfg @@ -1,14 +1,12 @@ # Beware that the quotes around the values are mandatory # GENERAL CONFIGURATION -{% if env == 'staging' %} -SQLALCHEMY_DATABASE_URI="postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}.stg/{{ fedoauth_db_name }}" -{% else %} -SQLALCHEMY_DATABASE_URI="postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}/{{ fedoauth_db_name }}" -{% endif %} - - GLOBAL = {'reverse_proxied': True, +{% if env == 'staging' %} +'database_url': "postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}.stg/{{ fedoauth_db_name }}", +{% else %} +'database_url': "postgresql://{{ fedoauth_db_user }}:{{ fedoauth_db_pass }}@{{ fedoauth_db_host }}/{{ fedoauth_db_name }}", +{% endif %} 'cookies_secure': True, 'transactions_timeout': 5, 'global_template_dir': '/usr/share/fedoauth/templates/global/',