Merge 76a98e8 into bc67c58

release-engineering · Feb 16, 2023 · 794a573 · 794a573
2 parents bc67c58 + 76a98e8
commit 794a573
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,6 +18,10 @@
 #
 import os
 import sys
+
+# This will cause the Flask application to be created with development configs
+os.environ['DEV'] = 'true'
+
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
 import greenwave  # noqa: E402
 

diff --git a/greenwave/utils.py b/greenwave/utils.py
@@ -77,7 +77,7 @@ def load_config(config_obj=None):
     if config_obj is None:
         if os.getenv('TEST') == 'true':
             config_obj = 'greenwave.config.TestingConfig'
-        elif os.getenv('DEV') == 'true' or os.getenv('DOCS') == 'true':
+        elif os.getenv('DEV') == 'true':
             config_obj = 'greenwave.config.DevelopmentConfig'
         else:
             config_obj = 'greenwave.config.ProductionConfig'
@@ -86,10 +86,6 @@ def load_config(config_obj=None):
         default_config_file = os.path.join(os.getcwd(), 'conf', 'settings.py.example')
     elif os.getenv('DEV') == 'true':
         default_config_file = os.path.join(os.getcwd(), 'conf', 'settings.py')
-    elif os.getenv('DOCS') == 'true':
-        default_config_file = os.path.normpath(
-            os.path.join(os.getcwd(), '..', 'conf', 'settings.py.example')
-        )
     else:
         default_config_file = '/etc/greenwave/settings.py'