From 77ec451445629ef214dada73b8728acdf255c405 Mon Sep 17 00:00:00 2001 From: Paolo Tormene Date: Wed, 8 Jan 2025 15:32:08 +0100 Subject: [PATCH] Fix comments about WEBUI_USER --- .../server/local_settings.py.aelo_aristotle | 19 ++++++++++--------- openquake/server/local_settings.py.pam | 19 +++++++++++-------- openquake/server/local_settings.py.server | 18 ++++++++++-------- openquake/server/local_settings.py.tools | 19 +++++++++++-------- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/openquake/server/local_settings.py.aelo_aristotle b/openquake/server/local_settings.py.aelo_aristotle index 77aa0f81f2f..fa332039a0d 100644 --- a/openquake/server/local_settings.py.aelo_aristotle +++ b/openquake/server/local_settings.py.aelo_aristotle @@ -6,8 +6,16 @@ DISABLE_VERSION_WARNING = True ARISTOTLE_DEFAULT_USGS_ID = '' -# # Static Folder -# STATIC_ROOT = '' +# By default it is 'openquake' +# WEBUI_USER = + +# Folder STATIC_ROOT is the full, absolute path to your static files folder. +# Furthermore, the user WEBUI_USER must own that directory. +STATIC_ROOT = '/var/www/webui' + +# Configure the directory to store the server user access log +# Furthermore, the user WEBUI_USER must own that directory. +WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' # WEBUI config uncomment and set properly if needed # WEBUIURL = 'http://localhost:8800/' @@ -37,13 +45,6 @@ SERVER_NAME = # values USE_REVERSE_PROXY = -# By default it is 'openquake' -# WEBUI_USER = - -# Configure the directory to store the server user access log -# Furthermore, the user WEBUI_USER must own that directory. -WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. diff --git a/openquake/server/local_settings.py.pam b/openquake/server/local_settings.py.pam index 65603469cfc..22fe48b809f 100644 --- a/openquake/server/local_settings.py.pam +++ b/openquake/server/local_settings.py.pam @@ -17,9 +17,17 @@ AUTHENTICATION_BACKENDS += ( 'django_pam.auth.backends.PAMBackend', ) -#Static Folder +# By default it is 'openquake' +# WEBUI_USER = + +# Folder STATIC_ROOT is the full, absolute path to your static files folder. +# Furthermore, the user WEBUI_USER must own that directory. STATIC_ROOT = '/var/www/webui' +# Configure the directory to store the server user access log +# Furthermore, the user WEBUI_USER must own that directory. +WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' + # WEBUI config uncomment and set properly if needed # WEBUIURL = 'http://localhost:8800/' @@ -29,13 +37,6 @@ STATIC_ROOT = '/var/www/webui' # enable WEBUI_PATHPREFIX to place webui pages below a specific path # WEBUI_PATHPREFIX='/path/prefix' -# By default it is 'openquake' -# WEBUI_USER = - -# Configure the directory to store the server user access log -# Furthermore, the user WEBUI_USER must own that directory. -WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -45,3 +46,5 @@ WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' # This is reasonable in an internal installation, otherwise set it to False DEBUG = True + +SUPPRESS_PERMISSION_DENIED_WARNINGS = True diff --git a/openquake/server/local_settings.py.server b/openquake/server/local_settings.py.server index 8dfdbc1f759..07d3f9792da 100644 --- a/openquake/server/local_settings.py.server +++ b/openquake/server/local_settings.py.server @@ -3,10 +3,17 @@ APPLICATION_MODE = 'RESTRICTED' # Disable sharing of results across users ACL_ON = True +# By default it is 'openquake' +# WEBUI_USER = + # Folder STATIC_ROOT is the full, absolute path to your static files folder. -# Furthermore, the user `openquake` must own that directory. +# Furthermore, the user WEBUI_USER must own that directory. STATIC_ROOT = '/var/www/webui' +# Configure the directory to store the server user access log +# Furthermore, the user WEBUI_USER must own that directory. +WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' + # WEBUI config uncomment and set properly if needed # WEBUIURL = 'http://localhost:8800/' @@ -17,13 +24,6 @@ STATIC_ROOT = '/var/www/webui' # the path must start with ``/`` and ending without it (e.g. ``'/path/prefix'``) # WEBUI_PATHPREFIX='/path/prefix' -# By default it is 'openquake' -# WEBUI_USER = - -# Configure the directory to store the server user access log -# Furthermore, the user WEBUI_USER must own that directory. -WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -32,3 +32,5 @@ WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' # TIME_ZONE = DEBUG = False + +SUPPRESS_PERMISSION_DENIED_WARNINGS = True diff --git a/openquake/server/local_settings.py.tools b/openquake/server/local_settings.py.tools index 649d1a48d3a..9c7f9a5269a 100644 --- a/openquake/server/local_settings.py.tools +++ b/openquake/server/local_settings.py.tools @@ -5,9 +5,17 @@ APPLICATION_MODE = 'TOOLS_ONLY' # Disable sharing of results across users (default True) # ACL_ON = True -#Static Folder +# By default it is 'openquake' +# WEBUI_USER = + +# Folder STATIC_ROOT is the full, absolute path to your static files folder. +# Furthermore, the user WEBUI_USER must own that directory. STATIC_ROOT = '/var/www/webui' +# Configure the directory to store the server user access log +# Furthermore, the user WEBUI_USER must own that directory. +WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' + # WEBUI config uncomment and set properly if needed # WEBUIURL = 'http://localhost:8800/' @@ -17,13 +25,6 @@ STATIC_ROOT = '/var/www/webui' # enable WEBUI_PATHPREFIX to place webui pages below a specific path # WEBUI_PATHPREFIX='/path/prefix' -# By default it is 'openquake' -# WEBUI_USER = - -# Configure the directory to store the server user access log -# Furthermore, the user WEBUI_USER must own that directory. -WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -33,3 +34,5 @@ WEBUI_ACCESS_LOG_DIR = '/var/log/oq-engine' # Set debug if the installation is dev mode DEBUG = os.environ.get('TOOLS_DEV', False) == 'True' + +SUPPRESS_PERMISSION_DENIED_WARNINGS = True