scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-30 17:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a new knob as discussed on matrix with lub

Browse Source 
(cherry picked from commit 0dcc059cd6)

# Conflicts:
#	core/admin/mailu/configuration.py
This commit is contained in:
Florent Daigniere
2021-03-05 22:26:46 +01:00
committed by Mergify
parent f63ec28ee2
commit 62e7ce8245
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/admin/mailu/configuration.py
View File

@@ -72,6 +72,7 @@ DEFAULT_CONFIG = {
'LOGO_URL': None, 'LOGO_URL': None,
'LOGO_BACKGROUND': None, 'LOGO_BACKGROUND': None,
# Advanced settings # Advanced settings
<<<<<<< HEAD
'AUTH_REQUIRE_TOKENS': False, 'AUTH_REQUIRE_TOKENS': False,
'API': False, 'API': False,
'WEB_API': '/api', 'WEB_API': '/api',
@@ -92,6 +93,23 @@ DEFAULT_CONFIG = {
'PROXY_AUTH_HEADER': 'X-Auth-Email', 'PROXY_AUTH_HEADER': 'X-Auth-Email',
'PROXY_AUTH_CREATE': False, 'PROXY_AUTH_CREATE': False,
'PROXY_AUTH_LOGOUT_URL': None, 'PROXY_AUTH_LOGOUT_URL': None,
=======
'PASSWORD_SCHEME': 'PBKDF2',
'LOG_LEVEL': 'WARNING',
'SESSION_COOKIE_SECURE': True,
# Host settings
'HOST_IMAP': 'imap',
'HOST_LMTP': 'imap:2525',
'HOST_POP3': 'imap',
'HOST_SMTP': 'smtp',
'HOST_AUTHSMTP': 'smtp',
'HOST_ADMIN': 'admin',
'WEBMAIL': 'none',
'HOST_WEBMAIL': 'webmail',
'HOST_WEBDAV': 'webdav:5232',
'HOST_REDIS': 'redis',
'HOST_FRONT': 'front',
>>>>>>> 0dcc059c (Add a new knob as discussed on matrix with lub)
'SUBNET': '192.168.203.0/24', 'SUBNET': '192.168.203.0/24',
'SUBNET6': None, 'SUBNET6': None,
} }
@@ -151,7 +169,6 @@ class ConfigManager:
self.config['QUOTA_STORAGE_URL'] = 'redis://{0}/1'.format(self.config['REDIS_ADDRESS']) self.config['QUOTA_STORAGE_URL'] = 'redis://{0}/1'.format(self.config['REDIS_ADDRESS'])
self.config['SESSION_COOKIE_SAMESITE'] = 'Strict' self.config['SESSION_COOKIE_SAMESITE'] = 'Strict'
self.config['SESSION_COOKIE_HTTPONLY'] = True self.config['SESSION_COOKIE_HTTPONLY'] = True
self.config['SESSION_COOKIE_SECURE'] = self.config['TLS_FLAVOR'] != 'notls'
# update the app config itself # update the app config itself
app.config = self app.config = self
>>>>>>> aa8cb989 (Set sensible cookie options) >>>>>>> aa8cb989 (Set sensible cookie options)

2
docs/configuration.rst
View File

@@ -235,6 +235,8 @@ intend to access it over plain HTTP.
requests before a session is invalidated. ``PERMANENT_SESSION_LIFETIME`` (default: 108000) requests before a session is invalidated. ``PERMANENT_SESSION_LIFETIME`` (default: 108000)
is the maximum amount of time in seconds a session can be kept alive for if it hasn't timed-out. is the maximum amount of time in seconds a session can be kept alive for if it hasn't timed-out.
The ``SESSION_COOKIE_SECURE`` (default: True) setting controls the secure flag on the cookies of the administrative interface. It should only be turned off if you intend to access it over plain HTTP.
The ``LOG_LEVEL`` setting is used by the python start-up scripts as a logging threshold. The ``LOG_LEVEL`` setting is used by the python start-up scripts as a logging threshold.
Log messages equal or higher than this priority will be printed. Log messages equal or higher than this priority will be printed.
Can be one of: CRITICAL, ERROR, WARNING, INFO, DEBUG or NOTSET. Can be one of: CRITICAL, ERROR, WARNING, INFO, DEBUG or NOTSET.