From ee6e578538239d8ac3f2accef4c7ef538adb4f88 Mon Sep 17 00:00:00 2001 From: Christian Dresen <c.dresen@fh-muenster.de> Date: Wed, 12 Oct 2016 00:18:49 +0200 Subject: [PATCH] [WarpInfra] Parameterize running apps inside config file. Closed #31 --- www/conf/config.example.ini | 4 ++++ www/web/warpzone/settings.py | 15 ++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www/conf/config.example.ini b/www/conf/config.example.ini index 48e8fad..385f88b 100644 --- a/www/conf/config.example.ini +++ b/www/conf/config.example.ini @@ -1,3 +1,7 @@ +[common] +# Possible Apps: warpmain, warpauth, warpfood, warpapi, warppay +APPS = warpmain, warpauth, warpfood, warppay, warpapi + [debug] DEBUG = true diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py index 1ca9f1b..0edfc27 100644 --- a/www/web/warpzone/settings.py +++ b/www/web/warpzone/settings.py @@ -12,6 +12,8 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) config = configparser.RawConfigParser() config.read('/etc/warpinfra/config.ini') +# COMMON +APPS = [app.strip() for app in config.get('common','APPS').split(",")] # LDAP LDAP_HOST = "ldap://"+config.get('ldap','LDAP_HOST') @@ -57,7 +59,7 @@ LOGIN_REDIRECT_URL = '/' MEDIA_ROOT = 'templates/media/' MEDIA_URL = '/media/' -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -72,14 +74,9 @@ INSTALLED_APPS = ( 'django_otp', 'django_otp.plugins.otp_static', 'django_otp.plugins.otp_totp', - 'two_factor', - 'warpapi', - 'warpmain', - 'warpauth', - 'warpfood', - - # 'warppay' -) + 'two_factor' +] +INSTALLED_APPS.extend(APPS) MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', -- GitLab