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

Try to solve the conflict between role vars and global vars

Browse source
This commit is contained in:
Aurélien Bompard 2014-09-18 08:46:01 +00:00
parent 292a98d737
commit 444c0c8f62
8 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/mailman/templates/settings_admin.py.j2
View file

@ -16,9 +16,9 @@ DATABASES = {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'hyperkitty',
'USER': 'hyperkittyadmin',
'PASSWORD': '{{ mailman_hk_admin_db_pass }}',
'HOST': '{{ mailman_dbserver }}',
'PASSWORD': '{{ mailman_hyperkitty_admin_db_pass }}',
'HOST': '{{ mailman_db_server }}',
'PORT': '',
}
}
KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_ks_admin_db_pass }}@{{ mailman_dbserver }}/kittystore'
KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'