[extensions-web] settings: allow passing DEBUG and NO_SECURE_SETTINGS via environment



commit e147b4c648604e80b8a2a0ad433719167ec86beb
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Wed Apr 3 20:05:16 2019 +0400

    settings: allow passing DEBUG and NO_SECURE_SETTINGS via environment

 README.rst                          | 1 +
 openshift/docker/docker-compose.yml | 2 ++
 sweettooth/settings.py              | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/README.rst b/README.rst
index f853ab2..f24d533 100644
--- a/README.rst
+++ b/README.rst
@@ -56,6 +56,7 @@ You can start website with commands:
     EGO_NODE_ADDRESS=extensions-web \
     EGO_SECRET_KEY=SOME_SECRET_KEY \
     EGO_XAPIAN_DB=/extensions-web/data/xapian.db \
+    EGO_NO_SECURE_SETTINGS=1 \
     docker-compose up --build
 
 That's all! Website will be available as http://localhost:8080.
diff --git a/openshift/docker/docker-compose.yml b/openshift/docker/docker-compose.yml
index ebe70d4..b3fdbef 100644
--- a/openshift/docker/docker-compose.yml
+++ b/openshift/docker/docker-compose.yml
@@ -24,7 +24,9 @@ services:
       EGO_ADMINISTRATOR_EMAIL: ykonotopov gnome org
       EGO_ALLOWED_HOST:
       EGO_DATABASE_URL:
+      EGO_DEBUG:
       EGO_EMAIL_URL:
+      EGO_NO_SECURE_SETTINGS:
       EGO_SECRET_KEY:
       EGO_XAPIAN_DB:
       EGO_MEDIA_ROOT: /extensions-web/www/uploaded-files
diff --git a/sweettooth/settings.py b/sweettooth/settings.py
index ea22459..08341a5 100644
--- a/sweettooth/settings.py
+++ b/sweettooth/settings.py
@@ -23,7 +23,7 @@ XAPIAN_DB_PATH = os.getenv('EGO_XAPIAN_DB') or os.path.join(BASE_DIR, 'xapian.db
 SECRET_KEY = os.getenv('EGO_SECRET_KEY') or ''
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True if os.getenv('EGO_DEBUG') else False
 
 ALLOWED_HOSTS = [os.getenv('EGO_ALLOWED_HOST') or "extensions.gnome.org"]
 
@@ -173,7 +173,7 @@ if os.getenv('EGO_EMAIL_URL'):
     vars().update(dj_email_url.parse(os.getenv('EGO_EMAIL_URL')))
 
 
-NO_SECURE_SETTINGS = False
+NO_SECURE_SETTINGS = True if os.getenv('EGO_NO_SECURE_SETTINGS') else False
 NO_STATICFILES_SETTINGS = False
 
 try:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]