diff --git a/salt/pillar/gnuviechadmin/init.sls b/salt/pillar/gnuviechadmin/init.sls index e6e937e..b311790 100644 --- a/salt/pillar/gnuviechadmin/init.sls +++ b/salt/pillar/gnuviechadmin/init.sls @@ -3,6 +3,7 @@ include: - gnuviechadmin.queues gnuviechadmin: + deploymenttype: local mailfrom: admin@gnuviech-server.de adminemail: admin@gnuviech-server.de sitename: Gnuviech Customer Self Service diff --git a/salt/roots/gnuviechadmin/gvasettings.sh b/salt/roots/gnuviechadmin/gvasettings.sh index 16edcd3..94b5aab 100644 --- a/salt/roots/gnuviechadmin/gvasettings.sh +++ b/salt/roots/gnuviechadmin/gvasettings.sh @@ -1,6 +1,6 @@ #!/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_EMAIL="{{ salt['pillar.get']('gnuviechadmin:adminemail') }}" export GVA_PGSQL_DATABASE="{{ salt['pillar.get']('gnuviechadmin-database:database') }}"