git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/conf/nginx/includes/site-defaults.conf b/mailcow/src/mailcow-dockerized/data/conf/nginx/includes/site-defaults.conf
index b38f4b2..ef2c4fb 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/nginx/includes/site-defaults.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/nginx/includes/site-defaults.conf
@@ -65,7 +65,7 @@
}
location ~ ^/api/v1/(.*)$ {
- try_files $uri $uri/ /json_api.php?query=$1;
+ try_files $uri $uri/ /json_api.php?query=$1&$args;
}
location ^~ /.well-known/acme-challenge/ {
@@ -163,7 +163,9 @@
proxy_connect_timeout 75;
proxy_send_timeout 3600;
proxy_read_timeout 3600;
- proxy_buffers 64 256k;
+ proxy_buffer_size 128k;
+ proxy_buffers 64 512k;
+ proxy_busy_buffers_size 512k;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
@@ -197,6 +199,9 @@
proxy_set_header x-webobjects-server-name $server_name;
proxy_set_header x-webobjects-server-url $client_req_scheme://$http_host;
proxy_set_header x-webobjects-server-port $server_port;
+ proxy_buffer_size 128k;
+ proxy_buffers 64 512k;
+ proxy_busy_buffers_size 512k;
proxy_send_timeout 3600;
proxy_read_timeout 3600;
client_body_buffer_size 128k;
diff --git a/mailcow/src/mailcow-dockerized/data/conf/phpfpm/php-conf.d/opcache-recommended.ini b/mailcow/src/mailcow-dockerized/data/conf/phpfpm/php-conf.d/opcache-recommended.ini
index 104f242..3c51e11 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/phpfpm/php-conf.d/opcache-recommended.ini
+++ b/mailcow/src/mailcow-dockerized/data/conf/phpfpm/php-conf.d/opcache-recommended.ini
@@ -1,6 +1,6 @@
opcache.enable=1
opcache.enable_cli=1
-opcache.interned_strings_buffer=8
+opcache.interned_strings_buffer=16
opcache.max_accelerated_files=10000
opcache.memory_consumption=128
opcache.save_comments=1
diff --git a/mailcow/src/mailcow-dockerized/data/conf/postfix/postscreen_access.cidr b/mailcow/src/mailcow-dockerized/data/conf/postfix/postscreen_access.cidr
index 63c7342..5509433 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/postfix/postscreen_access.cidr
+++ b/mailcow/src/mailcow-dockerized/data/conf/postfix/postscreen_access.cidr
@@ -1,53 +1,63 @@
-# Whitelist generated by Postwhite v3.4 on Sun Dec 15 21:16:19 CET 2019
+# Whitelist generated by Postwhite v3.4 on Mon 21 Mar 2022 06:50:26 PM CET
# https://github.com/stevejenkins/postwhite/
-# 1928 total rules
+# 1898 total rules
2a00:1450:4000::/36 permit
2a01:111:f400::/48 permit
2a01:111:f403::/48 permit
+2a01:4180:4050:0400::/64 permit
+2a01:4180:4050:0800::/64 permit
+2a01:4180:4051:0400::/64 permit
+2a01:4180:4051:0800::/64 permit
2a02:a60:0:5::/64 permit
2c0f:fb50:4000::/36 permit
-3.93.157.0/24 permit
8.20.114.31 permit
8.25.194.0/23 permit
8.25.196.0/23 permit
8.39.54.0/23 permit
8.40.222.0/23 permit
-8.45.169.0/24 permit
12.130.86.238 permit
+13.70.32.43 permit
+13.72.50.45 permit
+13.74.143.28 permit
13.77.161.179 permit
+13.78.233.182 permit
+13.92.31.129 permit
+13.110.208.0/21 permit
+13.110.216.0/22 permit
+13.110.224.0/20 permit
13.111.0.0/16 permit
-13.111.0.0/22 permit
-13.111.52.0/22 permit
-13.111.63.0/24 permit
-13.111.68.0/24 permit
-13.111.72.0/22 permit
-13.111.92.0/24 permit
-13.111.111.0/24 permit
-17.36.0.0/16 permit
17.41.0.0/16 permit
+17.57.155.0/24 permit
+17.57.156.0/24 permit
17.58.0.0/16 permit
17.110.0.0/15 permit
-17.111.110.0/23 permit
-17.120.0.0/16 permit
-17.133.0.0/16 permit
-17.139.0.0/16 permit
17.142.0.0/15 permit
-17.151.1.0/24 permit
-17.158.0.0/15 permit
17.162.0.0/15 permit
17.164.0.0/16 permit
17.171.37.0/24 permit
17.172.0.0/16 permit
17.179.168.0/23 permit
18.194.95.56 permit
-18.208.124.128/25 permit
+18.198.96.88 permit
+20.47.149.138 permit
+20.48.0.0/12 permit
+20.52.52.2 permit
+20.52.128.133 permit
+20.63.210.192/28 permit
+20.64.0.0/10 permit
+20.94.180.64/28 permit
+20.185.213.160/27 permit
+20.185.213.224/27 permit
20.185.214.0/27 permit
20.185.214.2 permit
20.185.214.32/27 permit
20.185.214.64/27 permit
-23.23.237.213 permit
-23.103.131.7 permit
+20.192.0.0/10 permit
+23.100.85.1 permit
23.103.224.0/19 permit
+23.249.208.0/20 permit
+23.251.224.0/19 permit
+23.253.141.0/24 permit
23.253.182.0/23 permit
23.253.182.103 permit
23.253.183.145 permit
@@ -68,11 +78,11 @@
27.123.206.56/29 permit
27.123.206.76/30 permit
27.123.206.80/28 permit
-27.126.146.0/24 permit
-34.200.123.20 permit
+34.194.25.167 permit
+34.194.144.120 permit
34.212.163.75 permit
-34.213.104.127 permit
34.225.212.172 permit
+34.247.168.44 permit
35.176.132.251 permit
35.190.247.0/24 permit
35.191.0.0/16 permit
@@ -80,7 +90,10 @@
37.218.248.47 permit
37.218.249.47 permit
37.218.251.62 permit
+39.156.163.64/29 permit
+40.71.187.0/24 permit
40.76.4.15 permit
+40.77.102.222 permit
40.92.0.0/15 permit
40.97.116.82 permit
40.97.128.194 permit
@@ -91,18 +104,20 @@
40.97.161.50 permit
40.97.164.146 permit
40.107.0.0/16 permit
+40.112.65.63 permit
40.112.72.205 permit
40.113.200.201 permit
+40.117.80.0/24 permit
+40.121.71.46 permit
41.74.192.0/22 permit
41.74.196.0/22 permit
41.74.200.0/23 permit
-41.74.201.0/24 permit
41.74.204.0/23 permit
-41.74.205.0/24 permit
+41.74.206.0/24 permit
42.159.163.81 permit
42.159.163.82 permit
42.159.163.83 permit
-46.19.168.0/23 permit
+43.228.184.0/22 permit
46.226.48.0/21 permit
46.228.36.37 permit
46.228.36.38/31 permit
@@ -160,26 +175,19 @@
50.18.125.97 permit
50.18.125.237 permit
50.18.126.162 permit
-50.23.218.192/27 permit
50.31.32.0/19 permit
-50.31.36.197 permit
-50.31.36.199 permit
-50.31.36.205 permit
-50.31.36.208 permit
-50.31.36.213 permit
-50.31.44.111 permit
-50.31.57.54/31 permit
-50.31.57.60 permit
-50.31.57.61 permit
-50.31.57.62 permit
-50.31.60.1 permit
50.31.156.96/27 permit
50.31.205.0/24 permit
-50.207.218.237 permit
51.4.71.62 permit
+51.4.72.0/24 permit
+51.4.80.0/27 permit
+51.5.72.0/24 permit
+51.5.80.0/27 permit
+51.137.58.21 permit
+51.140.75.55 permit
+51.144.100.179 permit
51.163.158.0/24 permit
-51.163.159.0/24 permit
-52.0.20.102 permit
+51.163.159.21 permit
52.5.230.59 permit
52.27.5.72 permit
52.27.28.47 permit
@@ -190,10 +198,15 @@
52.41.64.145 permit
52.60.41.5 permit
52.60.115.116 permit
+52.82.172.0/22 permit
+52.94.124.0/28 permit
52.95.48.152/29 permit
52.95.49.88/29 permit
52.100.0.0/14 permit
-52.128.40.0/21 permit
+52.119.213.144/28 permit
+52.160.39.140 permit
+52.165.175.144 permit
+52.185.106.240/28 permit
52.200.59.0/24 permit
52.205.61.79 permit
52.207.191.216 permit
@@ -201,26 +214,30 @@
52.222.73.83 permit
52.222.73.120 permit
52.222.75.85 permit
+52.234.172.96/28 permit
+52.236.28.240/28 permit
+52.237.141.173 permit
+52.244.206.214 permit
+52.247.53.144 permit
+52.250.107.196 permit
+52.250.126.174 permit
+52.251.55.143 permit
54.90.148.255 permit
54.156.255.69 permit
54.172.97.247 permit
-54.173.229.38 permit
-54.174.52.0/24 permit
-54.174.53.128/30 permit
-54.174.57.0/24 permit
-54.174.59.0/24 permit
-54.174.60.0/23 permit
-54.174.63.0/24 permit
54.186.193.102 permit
+54.191.223.5 permit
+54.194.61.95 permit
+54.195.113.45 permit
54.214.39.184 permit
+54.216.77.168 permit
54.240.0.0/18 permit
-54.240.40.0/25 permit
-54.240.56.128/26 permit
-54.240.63.0/25 permit
+54.240.64.0/19 permit
+54.240.96.0/19 permit
54.241.16.209 permit
-54.243.205.80 permit
54.244.54.130 permit
54.244.242.0/24 permit
+54.246.232.180 permit
62.13.128.0/24 permit
62.13.129.128/25 permit
62.13.136.0/22 permit
@@ -231,9 +248,9 @@
62.13.152.0/23 permit
62.17.146.128/26 permit
62.140.7.0/24 permit
-62.140.10.0/24 permit
+62.140.10.21 permit
+63.32.13.159 permit
63.80.14.0/23 permit
-63.111.28.137 permit
63.128.21.0/24 permit
63.143.57.128/25 permit
63.143.59.128/25 permit
@@ -241,9 +258,11 @@
64.20.241.45 permit
64.34.47.128/27 permit
64.34.57.192/26 permit
+64.71.149.160/28 permit
64.79.155.0/24 permit
-64.79.155.192 permit
-64.89.45.192/30 permit
+64.89.44.85 permit
+64.89.45.80 permit
+64.89.45.194 permit
64.89.45.196 permit
64.95.144.196 permit
64.127.115.252 permit
@@ -265,21 +284,21 @@
64.207.219.7 permit
64.207.219.8 permit
64.207.219.9 permit
-64.207.219.10 permit
-64.207.219.11 permit
-64.207.219.12 permit
+64.207.219.13 permit
+64.207.219.14 permit
+64.207.219.15 permit
64.207.219.71 permit
64.207.219.72 permit
64.207.219.73 permit
-64.207.219.74 permit
-64.207.219.75 permit
-64.207.219.76 permit
+64.207.219.77 permit
+64.207.219.78 permit
+64.207.219.79 permit
64.207.219.135 permit
64.207.219.136 permit
64.207.219.137 permit
-64.207.219.138 permit
-64.207.219.139 permit
-64.207.219.140 permit
+64.207.219.141 permit
+64.207.219.142 permit
+64.207.219.143 permit
64.233.160.0/19 permit
65.38.115.76 permit
65.38.115.84 permit
@@ -288,7 +307,6 @@
65.54.51.64/26 permit
65.54.61.64/26 permit
65.54.121.120/29 permit
-65.54.121.124/31 permit
65.54.190.0/24 permit
65.54.241.0/24 permit
65.55.29.77 permit
@@ -298,7 +316,6 @@
65.55.52.224/27 permit
65.55.78.128/25 permit
65.55.81.48/28 permit
-65.55.81.54/31 permit
65.55.90.0/24 permit
65.55.94.0/25 permit
65.55.111.0/24 permit
@@ -325,9 +342,6 @@
66.111.4.225 permit
66.111.4.229 permit
66.111.4.230 permit
-66.135.202.0/27 permit
-66.135.215.0/24 permit
-66.135.222.1 permit
66.162.193.226/31 permit
66.163.184.0/21 permit
66.163.184.0/24 permit
@@ -358,7 +372,8 @@
66.196.81.232/31 permit
66.196.81.234 permit
66.211.168.230/31 permit
-66.211.184.0/23 permit
+66.211.170.86/31 permit
+66.211.170.88/30 permit
66.218.74.64/30 permit
66.218.74.68/31 permit
66.218.75.112/30 permit
@@ -420,9 +435,7 @@
67.221.168.65 permit
67.228.2.24/30 permit
67.228.21.184/29 permit
-67.228.34.32/27 permit
67.228.37.4/30 permit
-67.228.50.54/31 permit
67.231.145.42 permit
67.231.153.30 permit
68.142.230.0/24 permit
@@ -432,17 +445,6 @@
68.142.230.72/30 permit
68.142.230.76/31 permit
68.142.230.78 permit
-68.232.131.164 permit
-68.232.131.172 permit
-68.232.131.183 permit
-68.232.131.185 permit
-68.232.143.44 permit
-68.232.145.216 permit
-68.232.148.56 permit
-68.232.148.128 permit
-68.232.148.138 permit
-68.232.157.60 permit
-68.232.157.143 permit
68.232.192.0/20 permit
69.63.178.128/25 permit
69.63.181.0/24 permit
@@ -456,9 +458,9 @@
69.171.232.0/24 permit
69.171.244.0/23 permit
70.37.151.128/25 permit
+70.42.149.0/24 permit
70.42.149.35 permit
72.3.185.0/24 permit
-72.3.237.64/28 permit
72.14.192.0/18 permit
72.21.192.0/19 permit
72.21.217.142 permit
@@ -523,8 +525,10 @@
72.32.154.0/24 permit
72.32.217.0/24 permit
72.32.243.0/24 permit
-72.34.168.75 permit
72.34.168.76 permit
+72.34.168.80 permit
+72.34.168.85 permit
+72.34.168.86 permit
72.52.72.32/28 permit
72.52.72.36 permit
74.6.128.0/21 permit
@@ -536,9 +540,6 @@
74.6.133.0/24 permit
74.6.134.0/24 permit
74.6.135.0/24 permit
-74.63.63.115 permit
-74.63.63.121 permit
-74.63.194.126 permit
74.63.212.0/24 permit
74.63.234.75 permit
74.63.236.0/24 permit
@@ -557,17 +558,9 @@
74.112.67.243 permit
74.125.0.0/16 permit
74.202.227.40 permit
-74.208.4.192/26 permit
-74.208.5.64/26 permit
-74.208.122.0/26 permit
74.209.250.0/24 permit
74.209.250.12 permit
-75.126.253.48 permit
-76.223.176.0/24 permit
-76.223.180.0/23 permit
-76.223.188.0/24 permit
-76.223.189.0/24 permit
-76.223.190.0/24 permit
+76.223.176.0/20 permit
77.238.176.0/22 permit
77.238.176.0/24 permit
77.238.177.0/24 permit
@@ -590,13 +583,11 @@
77.238.189.146/31 permit
77.238.189.148/30 permit
81.223.46.0/27 permit
-82.165.159.0/24 permit
-82.165.159.0/26 permit
-82.165.229.130 permit
-82.165.230.22 permit
84.16.77.1 permit
85.158.136.0/21 permit
86.61.88.25 permit
+87.198.219.130 permit
+87.198.219.153 permit
87.238.80.0/21 permit
87.248.103.12 permit
87.248.103.21 permit
@@ -633,11 +624,9 @@
87.248.117.201 permit
87.248.117.202 permit
87.248.117.205 permit
+87.252.219.254 permit
87.253.232.0/21 permit
89.22.108.0/24 permit
-91.194.248.0/23 permit
-91.211.240.0/22 permit
-91.211.243.0/24 permit
91.220.42.0/24 permit
94.236.119.0/26 permit
94.245.112.0/27 permit
@@ -649,7 +638,6 @@
96.43.148.64/28 permit
96.43.148.64/31 permit
96.43.151.64/28 permit
-96.46.150.192/27 permit
98.136.44.181 permit
98.136.44.182/31 permit
98.136.44.184 permit
@@ -1152,20 +1140,25 @@
98.139.245.180/31 permit
98.139.245.208/30 permit
98.139.245.212/31 permit
+99.78.197.208/28 permit
+103.2.140.0/22 permit
103.9.8.121 permit
103.9.8.122 permit
103.9.8.123 permit
103.9.96.0/22 permit
103.13.69.0/24 permit
-103.28.42.0/24 permit
-103.96.20.0/24 permit
-103.96.22.0/24 permit
+103.47.204.0/22 permit
+103.96.21.0/24 permit
+103.96.23.0/24 permit
+103.151.192.0/23 permit
103.237.104.0/22 permit
104.43.243.237 permit
104.47.0.0/17 permit
104.130.96.0/28 permit
104.130.122.0/23 permit
+104.214.25.77 permit
104.215.148.63 permit
+104.215.186.3 permit
104.245.209.192/26 permit
106.10.144.64/27 permit
106.10.144.100/31 permit
@@ -1291,6 +1284,7 @@
106.10.242.0/24 permit
106.10.243.0/24 permit
106.10.244.0/24 permit
+106.39.212.64/29 permit
106.50.16.0/28 permit
108.174.0.0/24 permit
108.174.0.215 permit
@@ -1302,13 +1296,14 @@
108.175.30.45 permit
108.177.8.0/21 permit
108.177.96.0/19 permit
-108.178.6.0/24 permit
109.237.142.0/24 permit
111.221.23.128/25 permit
111.221.26.0/27 permit
111.221.66.0/25 permit
111.221.69.128/25 permit
111.221.112.0/21 permit
+112.19.199.64/29 permit
+112.19.242.64/29 permit
116.214.12.0/24 permit
116.214.12.47 permit
116.214.12.48/31 permit
@@ -1325,6 +1320,7 @@
117.120.16.0/21 permit
119.42.242.52/31 permit
119.42.242.156 permit
+123.126.78.64/29 permit
124.47.150.0/24 permit
124.47.189.0/24 permit
124.108.96.0/24 permit
@@ -1332,11 +1328,19 @@
124.108.96.28/31 permit
124.108.96.70/31 permit
124.108.96.72/31 permit
+128.17.0.0/20 permit
+128.17.64.0/20 permit
+128.17.128.0/20 permit
+128.17.192.0/20 permit
128.127.70.0/26 permit
+128.245.0.0/20 permit
+128.245.64.0/20 permit
129.41.77.70 permit
129.41.169.249 permit
+129.146.236.58 permit
+129.153.194.228 permit
+129.159.87.137 permit
130.61.9.72 permit
-130.61.68.235 permit
130.211.0.0/22 permit
130.248.172.0/24 permit
130.248.173.0/24 permit
@@ -1345,8 +1349,10 @@
131.253.121.0/26 permit
131.253.121.20 permit
131.253.121.52 permit
-132.145.11.129 permit
132.145.13.209 permit
+132.226.26.225 permit
+132.226.49.32 permit
+132.226.56.24 permit
134.170.27.8 permit
134.170.113.0/26 permit
134.170.141.64/26 permit
@@ -1356,21 +1362,27 @@
135.84.82.0/24 permit
135.84.216.0/22 permit
136.143.182.0/23 permit
-136.143.188.0/23 permit
+136.143.184.0/24 permit
+136.143.188.0/24 permit
136.147.128.0/20 permit
136.147.135.0/24 permit
136.147.176.0/20 permit
136.147.176.0/24 permit
136.147.182.0/24 permit
+138.91.172.26 permit
139.60.152.0/22 permit
139.178.64.159 permit
139.178.64.195 permit
-139.180.17.0/24 permit
141.193.32.0/23 permit
+143.55.224.0/21 permit
+143.55.232.0/22 permit
+143.55.236.0/22 permit
+144.178.36.0/24 permit
+144.178.38.0/24 permit
146.20.112.0/26 permit
146.20.113.0/24 permit
146.20.191.0/24 permit
-146.88.28.0/24 permit
+146.20.215.0/24 permit
146.101.78.0/24 permit
147.75.65.173 permit
147.75.65.174 permit
@@ -1384,10 +1396,7 @@
148.105.0.14 permit
148.105.8.0/21 permit
149.72.0.0/16 permit
-151.101.1.140 permit
-151.101.65.140 permit
-151.101.129.140 permit
-151.101.193.140 permit
+152.67.105.195 permit
157.55.0.192/26 permit
157.55.1.128/26 permit
157.55.2.0/25 permit
@@ -1397,6 +1406,7 @@
157.55.61.0/24 permit
157.55.157.128/25 permit
157.55.225.0/25 permit
+157.55.254.216 permit
157.56.24.0/25 permit
157.56.120.128/26 permit
157.56.232.0/21 permit
@@ -1405,21 +1415,26 @@
157.58.196.96/29 permit
157.58.249.3 permit
157.151.208.65 permit
-158.247.16.0/20 permit
+157.255.1.64/29 permit
+159.92.157.0/24 permit
+159.92.158.0/24 permit
+159.92.159.0/24 permit
+159.92.160.0/24 permit
+159.92.161.0/24 permit
+159.92.162.0/24 permit
+159.135.132.128/25 permit
+159.135.140.80/29 permit
159.135.224.0/20 permit
-161.38.192.0/22 permit
-161.38.196.0/22 permit
-161.71.32.0/21 permit
+159.183.0.0/16 permit
+161.38.192.0/20 permit
+161.38.204.0/22 permit
+161.71.32.0/19 permit
+161.71.64.0/20 permit
162.208.119.181 permit
162.247.216.0/22 permit
-162.248.184.121 permit
-162.248.184.122 permit
-162.248.185.121 permit
-162.248.185.122 permit
-162.248.186.121 permit
-162.248.186.122 permit
-163.47.180.0/22 permit
+163.47.180.0/23 permit
163.114.130.16 permit
+163.114.132.120 permit
166.78.68.0/22 permit
166.78.68.221 permit
166.78.69.146 permit
@@ -1427,16 +1442,7 @@
166.78.69.170 permit
166.78.71.131 permit
167.89.0.0/17 permit
-167.89.2.4 permit
-167.89.22.44 permit
-167.89.25.84 permit
-167.89.31.192/29 permit
-167.89.32.5 permit
-167.89.32.50 permit
167.89.46.159 permit
-167.89.46.185 permit
-167.89.60.95 permit
-167.89.62.118 permit
167.89.64.9 permit
167.89.65.0 permit
167.89.65.53 permit
@@ -1448,22 +1454,15 @@
167.89.75.164 permit
167.89.101.2 permit
167.89.101.192/28 permit
-167.89.107.125 permit
-167.89.107.127 permit
-167.89.107.129 permit
-167.89.107.136 permit
-167.216.129.170 permit
-167.216.129.182/31 permit
-167.216.129.184/29 permit
-167.216.129.192/29 permit
-167.216.129.200 permit
-167.216.129.205 permit
-167.216.129.206/31 permit
-167.216.129.208/31 permit
167.216.129.210 permit
+167.216.131.180 permit
167.220.67.232/29 permit
167.220.67.238 permit
+168.138.5.36 permit
168.245.0.0/17 permit
+170.10.68.0/22 permit
+170.10.129.0/24 permit
+170.10.133.0/24 permit
172.217.0.0/19 permit
172.217.32.0/20 permit
172.217.128.0/19 permit
@@ -1473,8 +1472,6 @@
172.253.112.0/20 permit
173.0.84.224/27 permit
173.0.94.244/30 permit
-173.193.132.134/31 permit
-173.193.210.32/27 permit
173.194.0.0/16 permit
173.203.79.182 permit
173.203.81.39 permit
@@ -1482,7 +1479,6 @@
173.224.160.188 permit
173.224.161.128/25 permit
173.228.155.0/24 permit
-173.236.20.0/24 permit
174.36.84.8/29 permit
174.36.84.16/29 permit
174.36.84.32/29 permit
@@ -1494,30 +1490,25 @@
174.36.114.148/30 permit
174.36.114.152/29 permit
174.37.67.28/30 permit
-174.37.226.64/27 permit
-174.129.194.241 permit
174.129.203.189 permit
-174.137.46.0/24 permit
176.32.105.0/24 permit
176.32.127.0/24 permit
178.236.10.128/26 permit
180.189.28.0/24 permit
182.50.76.0/22 permit
182.50.78.64/28 permit
-184.173.105.0/24 permit
-184.173.153.0/24 permit
-185.4.120.0/24 permit
-185.4.122.0/24 permit
+183.240.219.64/29 permit
185.12.80.0/22 permit
185.28.196.0/22 permit
-185.58.84.0/24 permit
-185.58.87.0/24 permit
+185.58.84.93 permit
+185.58.85.0/24 permit
+185.58.86.0/24 permit
185.72.128.75 permit
185.72.128.76 permit
+185.72.128.80 permit
185.80.93.204 permit
185.80.93.227 permit
185.80.95.31 permit
-185.90.20.0/22 permit
185.189.236.0/22 permit
185.211.120.0/22 permit
185.250.236.0/22 permit
@@ -1577,7 +1568,6 @@
192.64.236.0/24 permit
192.64.237.0/24 permit
192.64.238.0/24 permit
-192.92.97.0/24 permit
192.161.144.0/20 permit
192.162.87.0/24 permit
192.237.158.0/23 permit
@@ -1589,37 +1579,34 @@
192.254.113.10 permit
192.254.113.101 permit
192.254.114.176 permit
-192.254.115.72 permit
192.254.118.63 permit
-192.254.127.96/27 permit
+193.7.206.0/25 permit
+193.7.207.0/25 permit
193.109.254.0/23 permit
-194.64.234.128/27 permit
+193.122.128.100 permit
194.64.234.129 permit
+194.104.109.0/24 permit
+194.104.111.0/24 permit
194.106.220.0/23 permit
-194.113.24.0/22 permit
194.154.193.192/27 permit
-195.54.172.0/23 permit
195.130.217.0/24 permit
+195.234.109.226 permit
195.245.230.0/23 permit
198.2.128.0/18 permit
198.2.128.0/24 permit
198.2.132.0/22 permit
198.2.136.0/23 permit
+198.2.145.0/24 permit
198.2.177.0/24 permit
-198.2.178.0/24 permit
-198.2.179.0/24 permit
+198.2.178.0/23 permit
198.2.180.0/24 permit
198.2.186.0/23 permit
198.21.0.0/21 permit
-198.21.3.166 permit
-198.21.4.224 permit
198.37.144.0/20 permit
-198.37.145.250 permit
-198.37.146.118/31 permit
-198.37.149.128 permit
-198.37.151.26 permit
+198.37.152.186 permit
198.61.254.0/23 permit
198.61.254.231 permit
+198.74.56.28 permit
198.178.234.57 permit
198.245.80.0/20 permit
198.245.81.0/24 permit
@@ -1636,18 +1623,15 @@
199.122.120.0/21 permit
199.122.123.0/24 permit
199.127.232.0/22 permit
-199.201.64.23 permit
-199.201.65.23 permit
199.255.192.0/22 permit
202.129.242.0/23 permit
202.165.102.47 permit
202.177.148.100 permit
202.177.148.110 permit
+203.31.36.0/22 permit
203.32.4.25 permit
-203.55.21.0/24 permit
203.81.17.0/24 permit
203.122.32.250 permit
-203.145.57.160/27 permit
203.188.194.32 permit
203.188.194.151 permit
203.188.194.203 permit
@@ -1680,32 +1664,30 @@
203.188.201.12/30 permit
203.209.230.75 permit
203.209.230.76/31 permit
-204.2.193.0/29 permit
204.11.168.0/21 permit
204.13.11.48/29 permit
-204.13.11.48/30 permit
204.14.232.0/21 permit
204.14.232.64/28 permit
204.14.234.64/28 permit
204.29.186.0/23 permit
-204.75.142.0/24 permit
204.79.197.212 permit
204.92.114.187 permit
204.92.114.203 permit
204.92.114.204/31 permit
204.141.32.0/23 permit
204.141.42.0/23 permit
-204.153.120.0/23 permit
+204.153.121.0/24 permit
+204.232.168.0/24 permit
205.139.110.0/24 permit
-205.139.111.0/24 permit
205.201.128.0/20 permit
205.201.131.128/25 permit
205.201.134.128/25 permit
205.201.136.0/23 permit
-205.201.137.229 permit
205.201.139.0/24 permit
205.207.104.0/22 permit
205.207.104.108 permit
+205.220.167.17 permit
+205.220.179.17 permit
205.251.233.32 permit
205.251.233.36 permit
206.25.247.143 permit
@@ -1727,6 +1709,8 @@
207.46.132.128/27 permit
207.46.198.0/25 permit
207.46.200.0/27 permit
+207.46.225.107 permit
+207.58.147.64/28 permit
207.67.38.0/24 permit
207.67.98.192/27 permit
207.68.176.0/26 permit
@@ -1734,7 +1718,8 @@
207.82.80.0/24 permit
207.126.144.0/20 permit
207.171.160.0/19 permit
-207.211.30.0/24 permit
+207.211.30.64/26 permit
+207.211.30.128/25 permit
207.211.31.0/25 permit
207.211.41.113 permit
207.218.90.0/24 permit
@@ -1743,7 +1728,7 @@
208.43.21.28/30 permit
208.43.21.64/29 permit
208.43.21.72/30 permit
-208.43.239.136/30 permit
+208.46.212.80 permit
208.46.212.208/31 permit
208.46.212.210 permit
208.64.132.0/22 permit
@@ -1773,13 +1758,13 @@
208.71.42.212/31 permit
208.71.42.214 permit
208.72.249.240/29 permit
-208.74.204.0/22 permit
208.74.204.9 permit
208.75.120.0/22 permit
208.75.122.246 permit
-208.82.236.96/28 permit
-208.82.237.96/28 permit
-208.82.238.96/28 permit
+208.82.237.96/29 permit
+208.82.237.104/31 permit
+208.82.238.96/29 permit
+208.82.238.104/31 permit
208.85.50.137 permit
208.117.48.0/20 permit
208.185.229.45 permit
@@ -1792,10 +1777,10 @@
209.67.98.59 permit
209.85.128.0/17 permit
212.4.136.0/26 permit
-212.25.240.75 permit
-212.25.240.76 permit
+212.25.240.80 permit
212.25.240.83 permit
-212.25.240.84 permit
+212.25.240.84/31 permit
+212.25.240.88 permit
212.82.96.0/24 permit
212.82.96.32/27 permit
212.82.96.64/29 permit
@@ -1836,13 +1821,8 @@
212.82.111.228/31 permit
212.82.111.230 permit
212.123.28.40 permit
-212.227.15.0/24 permit
-212.227.15.0/25 permit
-212.227.17.0/27 permit
-212.227.126.128/25 permit
-213.165.64.0/23 permit
-213.167.75.0/24 permit
-213.167.81.0/24 permit
+213.167.75.0/25 permit
+213.167.81.0/25 permit
213.199.128.139 permit
213.199.128.145 permit
213.199.138.181 permit
@@ -1851,6 +1831,7 @@
213.199.177.0/26 permit
216.17.150.242 permit
216.17.150.251 permit
+216.22.15.224/27 permit
216.24.224.0/20 permit
216.39.60.0/23 permit
216.39.60.154/31 permit
@@ -1877,17 +1858,9 @@
216.39.62.60/31 permit
216.39.62.136/29 permit
216.39.62.144/31 permit
-216.46.168.197 permit
-216.46.168.222 permit
-216.52.185.88/29 permit
+216.46.168.0/24 permit
216.58.192.0/19 permit
216.66.217.240/29 permit
-216.71.96.0/22 permit
-216.71.152.175 permit
-216.71.152.207 permit
-216.71.154.29 permit
-216.71.155.88 permit
-216.71.155.89 permit
216.74.162.13 permit
216.74.162.14 permit
216.82.240.0/20 permit
@@ -1897,9 +1870,6 @@
216.109.114.0/24 permit
216.109.114.32/27 permit
216.109.114.64/29 permit
-216.113.160.0/24 permit
-216.113.172.0/25 permit
-216.113.175.0/24 permit
216.128.126.97 permit
216.136.162.65 permit
216.136.162.120/29 permit
@@ -1909,14 +1879,13 @@
216.203.33.178/31 permit
216.205.24.0/24 permit
216.239.32.0/19 permit
-217.72.192.64/26 permit
-217.72.192.248/29 permit
-217.72.207.0/27 permit
217.77.141.52 permit
217.77.141.59 permit
-217.175.193.0/24 permit
-217.175.194.0/23 permit
-217.175.196.0/24 permit
+222.73.195.64/29 permit
+223.165.113.0/24 permit
+223.165.115.0/24 permit
+223.165.118.0/23 permit
+223.165.120.0/23 permit
2001:4860:4000::/36 permit
2404:6800:4000::/36 permit
2607:f8b0:4000::/36 permit
@@ -1925,6 +1894,7 @@
2620:109:c006:104::215 permit
2620:109:c006:104::/64 permit
2620:109:c00d:104::/64 permit
+2620:10d:c090:450::120 permit
2620:10d:c091:450::16 permit
2620:119:50c0:207::215 permit
2620:119:50c0:207::/64 permit
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/custom/bulk_header.map b/mailcow/src/mailcow-dockerized/data/conf/rspamd/custom/bulk_header.map
index 39aa7fe..69a20af 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/custom/bulk_header.map
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/custom/bulk_header.map
@@ -3,7 +3,6 @@
/.*episerver.*/i
/.*supergewinne.*/i
/List-Unsubscribe.*nbps\.eu/i
-/X-Mailer: AWeber.*/i
/.*regiofinder.*/i
/.*EmailSocket.*/i
/List-Unsubscribe:.*respread.*/i
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
index 9ca3409..f77d8a4 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/groups.conf
@@ -18,6 +18,9 @@
"ENCRYPTED_CHAT" {
score = -20.0;
}
+ "SOGO_CONTACT" {
+ score = -99.0;
+ }
}
group "MX" {
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
index 47373d9..daaa79b 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/metadata_exporter.conf
@@ -16,8 +16,7 @@
backend = "http";
url = "http://nginx:9081/pushover.php";
selector = "mailcow_rcpt";
- # Only return msgid, do not parse the full message
- formatter = "msgid";
+ formatter = "json";
meta_headers = true;
}
}
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf
deleted file mode 100644
index f4658db..0000000
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-rules {
- "LONG" {
- train {
- max_trains = 200;
- max_usages = 20;
- max_iterations = 25;
- learning_rate = 0.01,
- }
- symbol_spam = "NEURAL_SPAM_LONG";
- symbol_ham = "NEURAL_HAM_LONG";
- ann_expire = 45d;
- }
- "SHORT" {
- train {
- max_trains = 100;
- max_usages = 10;
- max_iterations = 15;
- learning_rate = 0.01,
- }
- symbol_spam = "NEURAL_SPAM_SHORT";
- symbol_ham = "NEURAL_HAM_SHORT";
- ann_expire = 7d;
- }
-}
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf b/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf
deleted file mode 100644
index fca5cec..0000000
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/local.d/neural_group.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-symbols = {
- "NEURAL_SPAM_LONG" {
- weight = 3.7; # sample weight
- description = "Neural network spam (long)";
- }
- "NEURAL_HAM_LONG" {
- weight = -4.0; # sample weight
- description = "Neural network ham (long)";
- }
- "NEURAL_SPAM_SHORT" {
- weight = 2.5; # sample weight
- description = "Neural network spam (short)";
- }
- "NEURAL_HAM_SHORT" {
- weight = -2.0; # sample weight
- description = "Neural network ham (short)";
- }
-}
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/lua/ivm-sg.lua b/mailcow/src/mailcow-dockerized/data/conf/rspamd/lua/ivm-sg.lua
deleted file mode 100644
index 6642fe4..0000000
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/lua/ivm-sg.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- Thanks to https://raw.githubusercontent.com/fatalbanana
-
-local lua_maps = require 'lua_maps'
-local rspamd_regexp = require 'rspamd_regexp'
-local rspamd_util = require 'rspamd_util'
-
-local ivm_sendgrid_ids = lua_maps.map_add_from_ucl(
- 'https://www.invaluement.com/spdata/sendgrid-id-dnsbl.txt',
- 'set',
- 'Invaluement Service Provider DNSBL: Sendgrid IDs'
-)
-
-local ivm_sendgrid_envfromdomains = lua_maps.map_add_from_ucl(
- 'https://www.invaluement.com/spdata/sendgrid-envelopefromdomain-dnsbl.txt',
- 'set',
- 'Invaluement Service Provider DNSBL: Sendgrid envelope domains'
-)
-
-local cb_id = rspamd_config:register_symbol({
- name = 'IVM_SENDGRID',
- callback = function(task)
- -- Is it Sendgrid?
- local sg_hdr = task:get_header('X-SG-EID')
- if not sg_hdr then return end
-
- -- Get original envelope from
- local env_from = task:get_from{'smtp', 'orig'}
- if not env_from then return end
-
- -- Check normalised domain in domains list
- if ivm_sendgrid_envfromdomains and ivm_sendgrid_envfromdomains:get_key(rspamd_util.get_tld(env_from[1].domain)) then
- task:insert_result('IVM_SENDGRID_DOMAIN', 1.0)
- end
-
- -- Check ID in ID list
- local lp_re = rspamd_regexp.create_cached([[^bounces\+(\d+)-]])
- local res = lp_re:search(env_from[1].user, true, true)
- if not res then return end
- if ivm_sendgrid_ids and ivm_sendgrid_ids:get_key(res[1][2]) then
- task:insert_result('IVM_SENDGRID_ID', 1.0)
- end
- end,
- description = 'Invaluement Service Provider DNSBL: Sendgrid',
- type = 'callback',
-})
-
-rspamd_config:register_symbol({
- name = 'IVM_SENDGRID_DOMAIN',
- parent = cb_id,
- group = 'ivmspdnsbl',
- score = 8.0,
- type = 'virtual',
-})
-
-rspamd_config:register_symbol({
- name = 'IVM_SENDGRID_ID',
- parent = cb_id,
- group = 'ivmspdnsbl',
- score = 8.0,
- type = 'virtual',
-})
diff --git a/mailcow/src/mailcow-dockerized/data/conf/rspamd/meta_exporter/pushover.php b/mailcow/src/mailcow-dockerized/data/conf/rspamd/meta_exporter/pushover.php
index a5e8334..10265d1 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/rspamd/meta_exporter/pushover.php
+++ b/mailcow/src/mailcow-dockerized/data/conf/rspamd/meta_exporter/pushover.php
@@ -47,12 +47,14 @@
}
$headers = getallheaders();
+$json_body = json_decode(file_get_contents('php://input'));
$qid = $headers['X-Rspamd-Qid'];
$rcpts = $headers['X-Rspamd-Rcpt'];
$sender = $headers['X-Rspamd-From'];
$ip = $headers['X-Rspamd-Ip'];
$subject = $headers['X-Rspamd-Subject'];
+$messageid= $json_body->message_id;
$priority = 0;
$symbols_array = json_decode($headers['X-Rspamd-Symbols'], true);
@@ -65,6 +67,20 @@
}
}
+$sender_address = $json_body->header_from[0];
+$sender_name = '-';
+if (preg_match('/(?<name>.*?)<(?<address>.*?)>/i', $sender_address, $matches)) {
+ $sender_address = $matches['address'];
+ $sender_name = trim($matches['name'], '"\' ');
+}
+
+$to_address = $json_body->header_to[0];
+$to_name = '-';
+if (preg_match('/(?<name>.*?)<(?<address>.*?)>/i', $to_address, $matches)) {
+ $to_address = $matches['address'];
+ $to_name = trim($matches['name'], '"\' ');
+}
+
$rcpt_final_mailboxes = array();
// Loop through all rcpts
@@ -229,9 +245,16 @@
$post_fields = array(
"token" => $api_data['token'],
"user" => $api_data['key'],
- "title" => sprintf("%s", str_replace(array('{SUBJECT}', '{SENDER}'), array($subject, $sender), $title)),
+ "title" => sprintf("%s", str_replace(
+ array('{SUBJECT}', '{SENDER}', '{SENDER_NAME}', '{SENDER_ADDRESS}', '{TO_NAME}', '{TO_ADDRESS}', '{MSG_ID}'),
+ array($subject, $sender, $sender_name, $sender_address, $to_name, $to_address, $messageid), $title)
+ ),
"priority" => $priority,
- "message" => sprintf("%s", str_replace(array('{SUBJECT}', '{SENDER}'), array($subject, $sender), $text))
+ "message" => sprintf("%s", str_replace(
+ array('{SUBJECT}', '{SENDER}', '{SENDER_NAME}', '{SENDER_ADDRESS}', '{TO_NAME}', '{TO_ADDRESS}', '{MSG_ID}', '\n'),
+ array($subject, $sender, $sender_name, $sender_address, $to_name, $to_address, $messageid, PHP_EOL), $text)
+ ),
+ "sound" => $attributes['sound'] ?? "pushover"
);
if ($attributes['evaluate_x_prio'] == "1" && $priority == 1) {
$post_fields['expire'] = 600;
diff --git a/mailcow/src/mailcow-dockerized/data/conf/sogo/sogo.conf b/mailcow/src/mailcow-dockerized/data/conf/sogo/sogo.conf
index 1d6a9d3..97a34e9 100644
--- a/mailcow/src/mailcow-dockerized/data/conf/sogo/sogo.conf
+++ b/mailcow/src/mailcow-dockerized/data/conf/sogo/sogo.conf
@@ -32,8 +32,6 @@
// );
// self-signed is not trusted anymore
- SOGoSieveServer = "sieve://dovecot:4190/?TLS=YES&tlsVerifyMode=none";
- SOGoSMTPServer = "smtp://postfix:588/?TLS=YES&tlsVerifyMode=none";
WOPort = "0.0.0.0:20000";
SOGoMemcachedHost = "memcached";