gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

make settings configurable via pillar, default to local

Browse source
This commit is contained in:
Jan Dittberner 2015-10-11 14:11:11 +02:00
parent 5578647f33
commit 5fe414133e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/pillar/gnuviechadmin/init.sls
View file

@ -3,6 +3,7 @@ include:
- gnuviechadmin.queues - gnuviechadmin.queues
gnuviechadmin: gnuviechadmin:
deploymenttype: local
mailfrom: admin@gnuviech-server.de mailfrom: admin@gnuviech-server.de
adminemail: admin@gnuviech-server.de adminemail: admin@gnuviech-server.de
sitename: Gnuviech Customer Self Service sitename: Gnuviech Customer Self Service

2
salt/roots/gnuviechadmin/gvasettings.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
export DJANGO_SETTINGS_MODULE="gnuviechadmin.settings.production" export DJANGO_SETTINGS_MODULE="gnuviechadmin.settings.{{ salt['pillar.get']('gnuviechadmin:deploymenttype', 'production') }}"
export GVA_ADMIN_NAME="Jan Dittberner" export GVA_ADMIN_NAME="Jan Dittberner"
export GVA_ADMIN_EMAIL="{{ salt['pillar.get']('gnuviechadmin:adminemail') }}" export GVA_ADMIN_EMAIL="{{ salt['pillar.get']('gnuviechadmin:adminemail') }}"
export GVA_PGSQL_DATABASE="{{ salt['pillar.get']('gnuviechadmin-database:database') }}" export GVA_PGSQL_DATABASE="{{ salt['pillar.get']('gnuviechadmin-database:database') }}"