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

finishing touches for PR# 2328

Browse Source 
Antispam.rst contained a syntax error.
Move config description to common section which is more fitting.
Fixed wrong assignment of default value for DEFAULT_SPAM_THRESHOLD in models.py.
This commit is contained in:
Dimitri Huisman
2022-08-19 17:58:33 +00:00
parent 82860d0f80
commit 81c9e01d24
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/admin/mailu/models.py
View File

@@ -509,7 +509,12 @@ class User(Base, Email):
displayed_name = db.Column(db.String(160), nullable=False, default='')
spam_enabled = db.Column(db.Boolean, nullable=False, default=True)
spam_mark_as_read = db.Column(db.Boolean, nullable=False, default=True)
spam_threshold = db.Column(db.Integer, nullable=False, default=app.config['DEFAULT_SPAM_THRESHOLD'])
def default_spam_threshold(cls):
if app:
return app.config['DEFAULT_SPAM_THRESHOLD']
else:
return 80
spam_threshold = db.Column(db.Integer, nullable=False, default=default_spam_threshold)
# Flask-login attributes
is_authenticated = True

2
docs/antispam.rst
View File

@@ -43,7 +43,7 @@ Rspamd rejects non-compliant email messages and email messages that contain viru
66% (10/15) is less than 80%, so the email is classified as ham. This email message will go to the inbox folder. If the user wants email messages with a score of 10 (66%) to be classified as spam, then the user defined spam filter tolerance can be lowered to 65% in the administration web interface.
The default spam filter tolerance used for new users can be configured using the environment variable ``DEFAULT_SPAM_THRESHOLD``. See also: :ref:`_advanced_cfg`.
The default spam filter tolerance used for new users can be configured using the environment variable ``DEFAULT_SPAM_THRESHOLD``. See also :ref:`common_cfg` in the configuration reference.
.. image:: assets/screenshots/SpamFiltering.png

4
docs/configuration.rst
View File

@@ -62,6 +62,8 @@ there is a good way to disable rate limiting altogether.
The ``TLS_FLAVOR`` sets how Mailu handles TLS connections. Setting this value to
``notls`` will cause Mailu not to server any web content! More on :ref:`tls_flavor`.
The ``DEFAULT_SPAM_THRESHOLD`` (default: 80) is the default spam tolerance used when creating a new user.
Mail settings
-------------
@@ -211,8 +213,6 @@ The ``TZ`` sets the timezone Mailu will use. The timezone naming convention usua
.. _`TZ database name`: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
The ``DEFAULT_SPAM_THRESHOLD`` (default: 80) setting is the default spam tolerance used when creating a new user.
Antivirus settings
------------------