netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

rspamd: fix templates (don't render unless the model exists) (#354)

Browse Source 
* rspamd: fix template mx-check

* fix antivirus.conf

* add a lock to templates
This commit is contained in:
Fabian Franz, BSc
2017-11-01 16:59:28 +01:00
committed by GitHub
parent 55dd1f8387
commit 541aeb23fb
9 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/2tld.inc.local
+1 -1
View File
@@ -1,4 +1,4 @@
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.surbl') %}
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.surbl.exceptions') and OPNsense.Rspamd.surbl.exceptions != '' %}
{% for host in OPNsense.Rspamd.surbl.exceptions.split(',') %}
{{ host }}
{% endfor %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/antivirus.conf
+2 -2
View File
@@ -13,9 +13,9 @@ clamav {
{% else %}
attachments_only = false;
{% endif %}
{% if helpers.exists('OPNsense.Rspamd.av.max-size') and OPNsense.Rspamd.av.max-size != '' %}
{% if helpers.exists('OPNsense.Rspamd.av.max-size') and OPNsense.Rspamd.av['max-size'] != '' %}
# If `max_size` is set, messages > n bytes in size are not scanned
max_size = {{ OPNsense.Rspamd.av.max-size }};
max_size = {{ OPNsense.Rspamd.av['max-size'] }};
{% endif %}
symbol = "CLAM_VIRUS";
type = "clamav";
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/antivirus.wl
+1 -1
View File
@@ -1,4 +1,4 @@
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.av') %}
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.av.whitelist') and OPNsense.Rspamd.av.whitelist != '' %}
{% for host in OPNsense.Rspamd.av.whitelist.split(',') %}
{{ host }}
{% endfor %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/greylist.conf
+2 -1
View File
@@ -1,7 +1,7 @@
# Please don't modify this file as your changes might be overwritten with
# the next update.
#
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.graylist') %}
expire = {{ OPNsense.Rspamd.graylist.expire|default('1') }}d;
timeout = {{ OPNsense.Rspamd.graylist.timeout|default('1') }}min; # 5 minutes by default
key_prefix = "rg"; # default hash name
@@ -11,3 +11,4 @@
action = "soft reject"; # default greylisted action
ipv4_mask = {{ OPNsense.Rspamd.graylist.ipv4mask|default('19') }};
ipv6_mask = {{ OPNsense.Rspamd.graylist.ipv6mask|default('64') }};
{% endif %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/mx_check.conf
+3 -1
View File
@@ -1,7 +1,9 @@
# Please don't modify this file as your changes might be overwritten with
# the next update.
#
{% if helpers.exists('OPNsense.Rspamd.mx-check.enabled') %}
timeout = 1.0;
expire = {{ OPNsense.Rspamd['mx-check'].expire|default('86400') }};
enabled = {% if helpers.exists('OPNsense.Rspamd.mx-check.enabled') and OPNsense.Rspamd['mx-check'].enabled == '1' %}true{% else %}false{% endif %};
{% endif %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/phishing.conf
+2 -1
View File
@@ -1,8 +1,9 @@
# Please don't modify this file as your changes might be overwritten with
# the next update.
#
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.phishing') %}
openphish_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_enabled') and OPNsense.Rspamd.phishing.openphish_enabled == '1' %}true{% else %}false{% endif %};
openphish_premium = {% if helpers.exists('OPNsense.Rspamd.phishing.openphish_premium_enabled') and OPNsense.Rspamd.phishing.openphish_premium_enabled == '1' %}true{% else %}false{% endif %};
# Disabled by default
phishtank_enabled = {% if helpers.exists('OPNsense.Rspamd.phishing.phishtank_enabled') and OPNsense.Rspamd.phishing.phishtank_enabled == '1' %}true{% else %}false{% endif %};
{% endif %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/ratelimit.conf
+3
View File
@@ -2,6 +2,7 @@
# the next update.
#
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.rate_limit') %}
rates {
# Limit for all mail per recipient (rate 2 per minute)
@@ -58,3 +59,5 @@ rates {
whitelisted_rcpts = "{{ OPNsense.Rspamd.rate_limit.whitelisted_rcpts|default('postmaster,mailer-daemon') }}";
max_rcpt = {{ OPNsense.Rspamd.rate_limit.max_rcpt|default('20') }};
{% endif %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/spf.conf
+3
View File
@@ -1,6 +1,9 @@
# Please don't modify this file as your changes might be overwritten with
# the next update.
#
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.spf') %}
spf_cache_size = {{ OPNsense.Rspamd.spf.spf_cache_size|default("2") }}k;
spf_cache_expire = {{ OPNsense.Rspamd.spf.spf_cache_expire|default("1") }}d;
{% endif %}
mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/surbl-whitelist.inc.local
+1 -1
View File
@@ -1,4 +1,4 @@
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.surbl') %}
{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' and helpers.exists('OPNsense.Rspamd.surbl.whitelist') and OPNsense.Rspamd.surbl.whitelist != '' %}
{% for host in OPNsense.Rspamd.surbl.whitelist.split(',') %}
{{ host }}
{% endfor %}