update postscreen_access.cidr

Merge pull request #5383 from Dexus-Forks/Dexus-patch-1
Update config for nginx >=1.25.1 (http2, server_names_hash_max_size, server_names_hash_bucket_size)
2023-09-01 00:14:15 +00:00 · 2023-08-29 12:05:44 +02:00 · 2023-08-28 16:23:27 +02:00 · 2023-08-12 16:59:15 +02:00 · 2023-08-12 16:58:26 +02:00 · 2023-08-12 07:20:56 +02:00
5 changed files with 24 additions and 45 deletions
--- a/data/Dockerfiles/dockerapi/main.py
+++ b/data/Dockerfiles/dockerapi/main.py
@@ -198,8 +198,8 @@ async def handle_pubsub_messages(channel: aioredis.client.PubSub):

  while True:
    try:
-      async with async_timeout.timeout(1):
-        message = await channel.get_message(ignore_subscribe_messages=True)
+      async with async_timeout.timeout(60):
+        message = await channel.get_message(ignore_subscribe_messages=True, timeout=30)
        if message is not None:
          # Parse message
          data_json = json.loads(message['data'].decode('utf-8'))
@@ -244,7 +244,7 @@ async def handle_pubsub_messages(channel: aioredis.client.PubSub):
          else:
            dockerapi.logger.error("Unknwon PubSub recieved - %s" % json.dumps(data_json))
              
-        await asyncio.sleep(0.01)
+        await asyncio.sleep(0.0)
    except asyncio.TimeoutError:
      pass

--- a/data/Dockerfiles/phpfpm/Dockerfile
+++ b/data/Dockerfiles/phpfpm/Dockerfile
@@ -6,7 +6,7 @@ ARG APCU_PECL_VERSION=5.1.22
 # renovate: datasource=github-tags depName=Imagick/imagick versioning=semver-coerced
 ARG IMAGICK_PECL_VERSION=3.7.0
 # renovate: datasource=github-tags depName=php/pecl-mail-mailparse versioning=semver-coerced
-ARG MAILPARSE_PECL_VERSION=v3.1.6
+ARG MAILPARSE_PECL_VERSION=3.1.4
 # renovate: datasource=github-tags depName=php-memcached-dev/php-memcached versioning=semver-coerced
 ARG MEMCACHED_PECL_VERSION=3.2.0
 # renovate: datasource=github-tags depName=phpredis/phpredis versioning=semver-coerced
--- a/data/conf/nginx/site.conf
+++ b/data/conf/nginx/site.conf
@@ -1,5 +1,6 @@
 proxy_cache_path /tmp levels=1:2 keys_zone=sogo:10m inactive=24h  max_size=1g;
-server_names_hash_bucket_size 64;
+server_names_hash_max_size 512;
+server_names_hash_bucket_size 128;

 map $http_x_forwarded_proto $client_req_scheme {
     default $scheme;
--- a/data/conf/nginx/templates/listen_ssl.template
+++ b/data/conf/nginx/templates/listen_ssl.template
@@ -1,2 +1,3 @@
-listen ${HTTPS_PORT} ssl http2;
-listen [::]:${HTTPS_PORT} ssl http2;
+listen ${HTTPS_PORT} ssl;
+listen [::]:${HTTPS_PORT} ssl;
+http2 on;
--- a/data/conf/postfix/postscreen_access.cidr
+++ b/data/conf/postfix/postscreen_access.cidr
@@ -1,11 +1,13 @@
-# Whitelist generated by Postwhite v3.4 on Mon Jul 31 10:06:06 UTC 2023
+# Whitelist generated by Postwhite v3.4 on Fri Sep  1 00:14:06 UTC 2023
 # https://github.com/stevejenkins/postwhite/
-# 2043 total rules
+# 2020 total rules
 2a00:1450:4000::/36	permit
 2a01:111:f400::/48	permit
+2a01:111:f403:2800::/53	permit
 2a01:111:f403:8000::/50	permit
 2a01:111:f403::/49	permit
 2a01:111:f403:c000::/51	permit
+2a01:111:f403:d000::/53	permit
 2a01:111:f403:f000::/52	permit
 2a02:a60:0:5::/64	permit
 2c0f:fb50:4000::/36	permit
@@ -113,14 +115,10 @@
 39.156.163.64/29	permit
 40.71.187.0/24	permit
 40.92.0.0/15	permit
+40.92.0.0/16	permit
 40.107.0.0/16	permit
 40.112.65.63	permit
 40.117.80.0/24	permit
-41.74.192.0/22	permit
-41.74.196.0/22	permit
-41.74.200.0/23	permit
-41.74.204.0/23	permit
-41.74.206.0/24	permit
 43.228.184.0/22	permit
 44.206.138.57	permit
 44.209.42.157	permit
@@ -192,8 +190,6 @@
 51.137.58.21	permit
 51.140.75.55	permit
 51.144.100.179	permit
-51.163.158.0/24	permit
-51.163.159.21	permit
 52.5.230.59	permit
 52.27.5.72	permit
 52.27.28.47	permit
@@ -220,6 +216,7 @@
 52.96.228.130	permit
 52.96.229.242	permit
 52.100.0.0/14	permit
+52.103.0.0/17	permit
 52.119.213.144/28	permit
 52.160.39.140	permit
 52.165.175.144	permit
@@ -272,8 +269,6 @@
 62.13.150.0/23	permit
 62.13.152.0/23	permit
 62.17.146.128/26	permit
-62.140.7.0/24	permit
-62.140.10.21	permit
 62.179.121.0/24	permit
 62.201.172.0/27	permit
 62.201.172.32/27	permit
@@ -300,8 +295,6 @@
 64.127.115.252	permit
 64.132.88.0/23	permit
 64.132.92.0/24	permit
-64.135.77.0/24	permit
-64.135.83.0/24	permit
 64.147.123.17	permit
 64.147.123.18	permit
 64.147.123.19	permit
@@ -622,6 +615,7 @@
 77.238.189.142	permit
 77.238.189.146/31	permit
 77.238.189.148/30	permit
+81.7.169.128/25	permit
 81.223.46.0/27	permit
 82.165.159.0/24	permit
 82.165.159.0/26	permit
@@ -674,7 +668,6 @@
 89.22.108.0/24	permit
 91.194.248.0/23	permit
 91.211.240.0/22	permit
-91.220.42.0/24	permit
 94.245.112.0/27	permit
 94.245.112.10/31	permit
 95.131.104.0/21	permit
@@ -1190,17 +1183,16 @@
 99.78.197.208/28	permit
 103.2.140.0/22	permit
 103.9.96.0/22	permit
-103.13.69.0/24	permit
 103.28.42.0/24	permit
 103.47.204.0/22	permit
-103.96.21.0/24	permit
-103.96.22.0/24	permit
-103.96.23.0/24	permit
 103.151.192.0/23	permit
 103.168.172.128/27	permit
 104.43.243.237	permit
 104.44.112.128/25	permit
 104.47.0.0/17	permit
+104.47.20.0/23	permit
+104.47.75.0/24	permit
+104.47.108.0/23	permit
 104.130.96.0/28	permit
 104.130.122.0/23	permit
 104.214.25.77	permit
@@ -1368,8 +1360,6 @@
 121.244.91.48	permit
 122.15.156.182	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
 124.108.96.24/31	permit
 124.108.96.28/31	permit
@@ -1396,6 +1386,7 @@
 129.41.169.249	permit
 129.80.5.164	permit
 129.80.67.121	permit
+129.145.74.12	permit
 129.146.88.28	permit
 129.146.147.105	permit
 129.146.236.58	permit
@@ -1408,6 +1399,7 @@
 129.159.87.137	permit
 129.213.195.191	permit
 130.61.9.72	permit
+130.162.39.83	permit
 130.211.0.0/22	permit
 131.253.30.0/24	permit
 131.253.121.0/26	permit
@@ -1466,8 +1458,6 @@
 146.20.215.0/24	permit
 146.20.215.182	permit
 146.88.28.0/24	permit
-146.101.78.0/24	permit
-147.28.36.0/24	permit
 147.160.158.0/24	permit
 147.243.1.47	permit
 147.243.1.48	permit
@@ -1592,7 +1582,6 @@
 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
 183.240.219.64/29	permit
@@ -1600,8 +1589,6 @@
 185.4.122.0/24	permit
 185.12.80.0/22	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
@@ -1682,22 +1669,16 @@
 192.254.113.10	permit
 192.254.113.101	permit
 192.254.114.176	permit
-193.7.206.0/25	permit
-193.7.207.0/25	permit
 193.109.254.0/23	permit
 193.122.128.100	permit
+193.123.56.63	permit
 194.64.234.128/27	permit
 194.64.234.129	permit
-194.104.109.0/24	permit
-194.104.110.21	permit
-194.104.110.240/28	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.4.92.0/23	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
@@ -1792,6 +1773,7 @@
 204.92.114.204/31	permit
 204.141.32.0/23	permit
 204.141.42.0/23	permit
+204.220.160.0/20	permit
 204.232.168.0/24	permit
 205.139.110.0/24	permit
 205.201.128.0/20	permit
@@ -1832,7 +1814,6 @@
 207.67.98.192/27	permit
 207.68.176.0/26	permit
 207.68.176.96/27	permit
-207.82.80.0/24	permit
 207.126.144.0/20	permit
 207.171.160.0/19	permit
 207.211.30.64/26	permit
@@ -1899,7 +1880,6 @@
 209.67.98.46	permit
 209.67.98.59	permit
 209.85.128.0/17	permit
-212.4.136.0/26	permit
 212.82.96.0/24	permit
 212.82.96.32/27	permit
 212.82.96.64/29	permit
@@ -1946,8 +1926,6 @@
 212.227.126.128/25	permit
 213.46.255.0/24	permit
 213.165.64.0/23	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
@@ -2006,7 +1984,6 @@
 216.136.162.65	permit
 216.136.162.120/29	permit
 216.136.168.80/28	permit
-216.145.217.0/24	permit
 216.145.221.0/24	permit
 216.198.0.0/18	permit
 216.203.30.55	permit
@@ -2039,7 +2016,7 @@
 2620:109:c006:104::/64	permit
 2620:109:c006:104::215	permit
 2620:109:c00d:104::/64	permit
-2620:10d:c090:450::120	permit
+2620:10d:c090:400::8:1	permit
 2620:10d:c091:400::8:1	permit
 2620:119:50c0:207::/64	permit
 2620:119:50c0:207::215	permit
Author	SHA1	Message	Date
milkmaker	8c5c90b1d1	update postscreen_access.cidr	2023-09-01 00:14:15 +00:00
Patrick Schult	372b1c7bbc	Merge pull request #5383 from Dexus-Forks/Dexus-patch-1 Update config for nginx >=1.25.1 (http2, server_names_hash_max_size, server_names_hash_bucket_size)	2023-08-29 12:05:44 +02:00
Patrick Schult	9ba5c13702	Merge pull request #5376 from mstilkerich/fix_dockerapi_cpuload Fix CPU load of dockerapi container	2023-08-28 16:23:27 +02:00
Josef Fröhle	095d59c01b	Update listen_ssl.template deprecated http2 on listener	2023-08-12 16:59:15 +02:00
Josef Fröhle	1a2f145b28	Update site.conf: server_names_hash_bucket_size 128	2023-08-12 16:58:26 +02:00
Michael Stilkerich	930473a980	Set asyncio timeout to 0 for yielding	2023-08-12 07:20:56 +02:00
Michael Stilkerich	533bd36572	Fix CPU load of dockerapi container Previously the handle_pubsub_messages() loop was executing every 10ms when there was no message available. Now reading from the redis network socket will block (the coroutine) for up to 30s before it returns when no message is available. Using channel.listen() would be even better, but it lacks the ignore_subscribe_messages option and I could not figure out how to filter the returned messages.	2023-08-05 20:58:34 +02:00
Patrick Schult	d6c3c58f42	Merge pull request #5360 from mailcow/staging 2023-08 - DQS Hotfixes	2023-08-03 11:36:53 +02:00