From ae8166984fe9d4490dc0dd4da6cdc087b882e37f Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 5 Dec 2021 17:28:46 +1100 Subject: [PATCH 1/2] Adjustments for maintenance-mode options: - Brings the state into the same directory as the runtime config file --- InvenTree/InvenTree/settings.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index bd1813312b..70447371f0 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -86,6 +86,9 @@ if not os.path.exists(cfg_filename): with open(cfg_filename, 'r') as cfg: CONFIG = yaml.safe_load(cfg) +# We will place any config files in the same directory as the config file +config_dir = os.path.dirname(cfg_filename) + # Default action is to run the system in Debug mode # SECURITY WARNING: don't run with debug turned on in production! DEBUG = _is_true(get_setting( @@ -206,6 +209,16 @@ if MEDIA_ROOT is None: print("ERROR: INVENTREE_MEDIA_ROOT directory is not defined") sys.exit(1) +# Options for django-maintenance-mode : https://pypi.org/project/django-maintenance-mode/ +MAINTENANCE_MODE_STATE_FILE_PATH = os.path.join( + config_dir, + 'maintenance_mode_state.txt', +) + +MAINTENANCE_MODE_IGNORE_ADMIN_SITE = True + +MAINTENANCE_MODE_IGNORE_SUPERUSER = True + # List of allowed hosts (default = allow all) ALLOWED_HOSTS = CONFIG.get('allowed_hosts', ['*']) From da020f6fd62a9c77f4fe41cdde0cbb41a6f170ef Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 6 Dec 2021 09:05:13 +1100 Subject: [PATCH 2/2] Remove extra options --- InvenTree/InvenTree/settings.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index 70447371f0..19e5518eb9 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -215,10 +215,6 @@ MAINTENANCE_MODE_STATE_FILE_PATH = os.path.join( 'maintenance_mode_state.txt', ) -MAINTENANCE_MODE_IGNORE_ADMIN_SITE = True - -MAINTENANCE_MODE_IGNORE_SUPERUSER = True - # List of allowed hosts (default = allow all) ALLOWED_HOSTS = CONFIG.get('allowed_hosts', ['*'])