From 6c9caec8d6e11ec28a668bb57345002b77ade711 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 11 Oct 2015 14:11:11 +0200 Subject: [PATCH] make settings configurable via pillar, default to local --- pillar/gnuviechadmin/init.sls | 1 + roots/gnuviechadmin/gvasettings.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pillar/gnuviechadmin/init.sls b/pillar/gnuviechadmin/init.sls index e6e937e..b311790 100644 --- a/pillar/gnuviechadmin/init.sls +++ b/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/roots/gnuviechadmin/gvasettings.sh b/roots/gnuviechadmin/gvasettings.sh index 16edcd3..94b5aab 100644 --- a/roots/gnuviechadmin/gvasettings.sh +++ b/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') }}"