Merge pull request #5819 from mailcow/staging

2024-04

.github/workflows/check_prs_if_on_staging.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.event.pull_request.base.ref != 'staging' #check if the target branch is not staging
     steps:
       - name: Send message
-        uses: thollander/actions-comment-pull-request@v2.4.3
+        uses: thollander/actions-comment-pull-request@v2.5.0
         with:
           GITHUB_TOKEN: ${{ secrets.CHECKIFPRISSTAGING_ACTION_PAT }}
           message: |

data/Dockerfiles/acme/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.18
 
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 ARG PIP_BREAK_SYSTEM_PACKAGES=1
 RUN apk upgrade --no-cache \

data/Dockerfiles/clamd/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 RUN apk upgrade --no-cache \
   && apk add --update --no-cache \

data/Dockerfiles/dockerapi/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 ARG PIP_BREAK_SYSTEM_PACKAGES=1
 WORKDIR /app

data/Dockerfiles/dovecot/Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.19
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 # renovate: datasource=github-releases depName=tianon/gosu versioning=semver-coerced extractVersion=^(?<version>.*)$
 ARG GOSU_VERSION=1.16

data/Dockerfiles/postfix/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:bullseye-slim
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C

data/Dockerfiles/rspamd/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:bullseye-slim
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG CODENAME=bullseye

data/Dockerfiles/sogo/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:bullseye-slim
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_VERSION=bullseye

data/Dockerfiles/sogo/bootstrap-sogo.sh

@@ -150,6 +150,8 @@ cat <<EOF > /var/lib/sogo/GNUstep/Defaults/sogod.plist
     <string>YES</string>
     <key>SOGoEncryptionKey</key>
     <string>${RAND_PASS}</string>
+    <key>OCSAdminURL</key>
+    <string>mysql://${DBUSER}:${DBPASS}@%2Fvar%2Frun%2Fmysqld%2Fmysqld.sock/${DBNAME}/sogo_admin</string>
     <key>OCSCacheFolderURL</key>
     <string>mysql://${DBUSER}:${DBPASS}@%2Fvar%2Frun%2Fmysqld%2Fmysqld.sock/${DBNAME}/sogo_cache_folder</string>
     <key>OCSEMailAlarmsFolderURL</key>

data/Dockerfiles/unbound/Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.18
 
-LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>"
+LABEL maintainer "The Infrastructure Company GmbH <info@servercow.de>"
 
 RUN apk add --update --no-cache \
 	curl \

data/conf/postfix/postscreen_access.cidr

@@ -1,6 +1,6 @@
-# Whitelist generated by Postwhite v3.4 on Thu Feb  1 00:13:50 UTC 2024
+# Whitelist generated by Postwhite v3.4 on Mon Apr  1 00:15:02 UTC 2024
 # https://github.com/stevejenkins/postwhite/
-# 2089 total rules
+# 2009 total rules
 2a00:1450:4000::/36	permit
 2a01:111:f400::/48	permit
 2a01:111:f403:8000::/50	permit
@@ -44,9 +44,10 @@
 18.198.96.88	permit
 18.208.124.128/25	permit
 18.216.232.154	permit
-18.234.1.244	permit
 18.236.40.242	permit
+18.236.56.161	permit
 20.51.6.32/30	permit
+20.51.98.61	permit
 20.52.52.2	permit
 20.52.128.133	permit
 20.59.80.4/30	permit
@@ -91,23 +92,22 @@
 27.123.204.172	permit
 27.123.204.188/30	permit
 27.123.204.192	permit
-27.123.206.0/24	permit
 27.123.206.50/31	permit
 27.123.206.56/29	permit
 27.123.206.76/30	permit
 27.123.206.80/28	permit
 31.25.48.222	permit
 34.195.217.107	permit
-34.202.239.6	permit
 34.212.163.75	permit
 34.215.104.144	permit
+34.218.116.3	permit
 34.225.212.172	permit
-34.247.168.44	permit
 35.161.32.253	permit
 35.167.93.243	permit
 35.176.132.251	permit
 35.190.247.0/24	permit
 35.191.0.0/16	permit
+35.242.169.159	permit
 37.218.248.47	permit
 37.218.249.47	permit
 37.218.251.62	permit
@@ -119,10 +119,10 @@
 40.112.65.63	permit
 43.228.184.0/22	permit
 44.206.138.57	permit
-44.209.42.157	permit
 44.236.56.93	permit
 44.238.220.251	permit
 46.19.168.0/23	permit
+46.19.170.16	permit
 46.226.48.0/21	permit
 46.228.36.37	permit
 46.228.36.38/31	permit
@@ -162,7 +162,6 @@
 46.228.38.144/29	permit
 46.228.38.152/31	permit
 46.228.38.154	permit
-46.228.39.0/24	permit
 46.228.39.64/27	permit
 46.228.39.96/30	permit
 46.228.39.100/30	permit
@@ -188,6 +187,7 @@
 51.137.58.21	permit
 51.140.75.55	permit
 51.144.100.179	permit
+52.1.14.157	permit
 52.5.230.59	permit
 52.27.5.72	permit
 52.27.28.47	permit
@@ -242,22 +242,17 @@
 54.174.63.0/24	permit
 54.186.193.102	permit
 54.191.223.56	permit
-54.194.61.95	permit
-54.195.113.45	permit
 54.213.20.246	permit
 54.214.39.184	permit
-54.216.77.168	permit
-54.221.227.204	permit
 54.240.0.0/18	permit
 54.240.64.0/19	permit
 54.240.96.0/19	permit
 54.241.16.209	permit
 54.244.54.130	permit
 54.244.242.0/24	permit
-54.246.232.180	permit
 54.255.61.23	permit
 62.13.128.0/24	permit
-62.13.128.150	permit
+62.13.128.196	permit
 62.13.129.128/25	permit
 62.13.136.0/22	permit
 62.13.140.0/22	permit
@@ -265,12 +260,12 @@
 62.13.148.0/23	permit
 62.13.150.0/23	permit
 62.13.152.0/23	permit
+62.13.159.196	permit
 62.17.146.128/26	permit
 62.179.121.0/24	permit
 62.201.172.0/27	permit
 62.201.172.32/27	permit
 62.253.227.114	permit
-63.32.13.159	permit
 63.80.14.0/23	permit
 63.111.28.137	permit
 63.128.21.0/24	permit
@@ -285,10 +280,6 @@
 64.79.155.193	permit
 64.79.155.205	permit
 64.79.155.206	permit
-64.89.44.85	permit
-64.89.45.80	permit
-64.89.45.194	permit
-64.89.45.196	permit
 64.127.115.252	permit
 64.132.88.0/23	permit
 64.132.92.0/24	permit
@@ -376,7 +367,6 @@
 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
 66.163.185.0/24	permit
 66.163.186.0/24	permit
@@ -389,7 +379,6 @@
 66.196.80.112/28	permit
 66.196.80.144/29	permit
 66.196.80.193	permit
-66.196.81.0/24	permit
 66.196.81.104/29	permit
 66.196.81.112/29	permit
 66.196.81.120	permit
@@ -432,12 +421,10 @@
 66.249.80.0/20	permit
 67.23.31.6	permit
 67.72.99.26	permit
-67.195.22.0/24	permit
 67.195.22.113	permit
 67.195.22.116/30	permit
 67.195.23.144/30	permit
 67.195.23.148	permit
-67.195.60.0/24	permit
 67.195.60.45	permit
 67.195.60.46/31	permit
 67.195.60.48/31	permit
@@ -445,7 +432,6 @@
 67.195.60.146	permit
 67.195.60.155	permit
 67.195.60.156	permit
-67.195.87.0/24	permit
 67.195.87.64	permit
 67.195.87.81	permit
 67.195.87.82/31	permit
@@ -470,7 +456,6 @@
 67.228.37.4/30	permit
 67.231.145.42	permit
 67.231.153.30	permit
-68.142.230.0/24	permit
 68.142.230.64/31	permit
 68.142.230.69	permit
 68.142.230.70/31	permit
@@ -486,10 +471,6 @@
 69.65.42.195	permit
 69.65.49.192/29	permit
 69.72.32.0/20	permit
-69.72.40.93	permit
-69.72.40.94/31	permit
-69.72.40.96/30	permit
-69.72.47.205	permit
 69.147.84.227	permit
 69.162.98.0/24	permit
 69.169.224.0/20	permit
@@ -529,7 +510,6 @@
 72.30.237.180/30	permit
 72.30.237.184/31	permit
 72.30.237.204/30	permit
-72.30.238.0/23	permit
 72.30.238.116/30	permit
 72.30.238.120/31	permit
 72.30.238.128	permit
@@ -560,12 +540,7 @@
 72.30.239.228/31	permit
 72.30.239.244/30	permit
 72.30.239.248/31	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
-74.6.128.0/21	permit
 74.6.128.0/24	permit
 74.6.129.0/24	permit
 74.6.130.0/24	permit
@@ -600,7 +575,6 @@
 75.2.70.75	permit
 76.223.128.0/19	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
 77.238.178.0/24	permit
@@ -642,8 +616,6 @@
 84.116.50.0/23	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
@@ -683,6 +655,7 @@
 87.253.232.0/21	permit
 89.22.108.0/24	permit
 91.211.240.0/22	permit
+94.169.2.0/23	permit
 94.245.112.0/27	permit
 94.245.112.10/31	permit
 95.131.104.0/21	permit
@@ -696,7 +669,6 @@
 98.136.44.181	permit
 98.136.44.182/31	permit
 98.136.44.184	permit
-98.136.164.0/24	permit
 98.136.164.36/31	permit
 98.136.164.64/29	permit
 98.136.164.72/30	permit
@@ -704,7 +676,6 @@
 98.136.164.78	permit
 98.136.172.32/30	permit
 98.136.172.36/31	permit
-98.136.185.0/24	permit
 98.136.185.29	permit
 98.136.185.42/31	permit
 98.136.185.46	permit
@@ -739,7 +710,6 @@
 98.136.215.184	permit
 98.136.215.208/30	permit
 98.136.215.212/31	permit
-98.136.217.0/24	permit
 98.136.217.1	permit
 98.136.217.2	permit
 98.136.217.3	permit
@@ -749,14 +719,12 @@
 98.136.217.12/30	permit
 98.136.217.16/30	permit
 98.136.217.20/30	permit
-98.136.218.0/24	permit
 98.136.218.39	permit
 98.136.218.40/29	permit
 98.136.218.48/28	permit
 98.136.218.67	permit
 98.136.218.68/30	permit
 98.136.218.72/30	permit
-98.137.12.0/24	permit
 98.137.12.48/30	permit
 98.137.12.52/31	permit
 98.137.12.54	permit
@@ -794,7 +762,6 @@
 98.137.13.132	permit
 98.137.13.137	permit
 98.137.13.138	permit
-98.137.64.0/21	permit
 98.137.64.0/24	permit
 98.137.65.0/24	permit
 98.137.66.0/24	permit
@@ -818,7 +785,6 @@
 98.138.83.176/31	permit
 98.138.83.179	permit
 98.138.83.180/31	permit
-98.138.84.0/22	permit
 98.138.84.37	permit
 98.138.84.38/31	permit
 98.138.84.40/29	permit
@@ -859,7 +825,6 @@
 98.138.87.148/31	permit
 98.138.87.192/30	permit
 98.138.87.196/31	permit
-98.138.88.0/22	permit
 98.138.88.105	permit
 98.138.88.106	permit
 98.138.88.128/30	permit
@@ -899,7 +864,6 @@
 98.138.91.2/31	permit
 98.138.91.4/31	permit
 98.138.91.6	permit
-98.138.100.0/23	permit
 98.138.100.220/30	permit
 98.138.100.224/30	permit
 98.138.100.228/31	permit
@@ -909,7 +873,6 @@
 98.138.104.100	permit
 98.138.104.112/30	permit
 98.138.104.116	permit
-98.138.120.0/24	permit
 98.138.120.36/30	permit
 98.138.120.48/28	permit
 98.138.197.46/31	permit
@@ -1002,12 +965,10 @@
 98.138.213.238/31	permit
 98.138.213.240/31	permit
 98.138.213.242	permit
-98.138.215.0/24	permit
 98.138.215.12/30	permit
 98.138.215.16/28	permit
 98.138.217.216/30	permit
 98.138.217.220/31	permit
-98.138.226.0/24	permit
 98.138.226.30/31	permit
 98.138.226.56/29	permit
 98.138.226.64/30	permit
@@ -1033,21 +994,18 @@
 98.138.227.108/31	permit
 98.138.227.128/30	permit
 98.138.227.132/31	permit
-98.138.229.0/24	permit
 98.138.229.24/29	permit
 98.138.229.32/31	permit
 98.138.229.122/31	permit
 98.138.229.138/31	permit
 98.138.229.154/31	permit
 98.138.229.170/31	permit
-98.139.164.0/24	permit
 98.139.164.96/30	permit
 98.139.164.100/30	permit
 98.139.164.104/29	permit
 98.139.164.112/30	permit
 98.139.172.112/30	permit
 98.139.172.116/31	permit
-98.139.175.0/24	permit
 98.139.175.65	permit
 98.139.175.66/31	permit
 98.139.175.68/30	permit
@@ -1072,10 +1030,8 @@
 98.139.210.196/31	permit
 98.139.210.202/31	permit
 98.139.210.204/30	permit
-98.139.211.0/24	permit
 98.139.211.160/30	permit
 98.139.211.192/28	permit
-98.139.212.0/23	permit
 98.139.212.160/28	permit
 98.139.212.176/29	permit
 98.139.212.184/30	permit
@@ -1090,7 +1046,6 @@
 98.139.214.155	permit
 98.139.214.156/30	permit
 98.139.214.221	permit
-98.139.215.0/24	permit
 98.139.215.228/31	permit
 98.139.215.230	permit
 98.139.215.248/30	permit
@@ -1149,14 +1104,12 @@
 98.139.220.243	permit
 98.139.220.245	permit
 98.139.220.253	permit
-98.139.221.0/24	permit
 98.139.221.43	permit
 98.139.221.60/30	permit
 98.139.221.156/30	permit
 98.139.221.232/30	permit
 98.139.221.236/31	permit
 98.139.221.250	permit
-98.139.244.0/24	permit
 98.139.244.47	permit
 98.139.244.49	permit
 98.139.244.50/31	permit
@@ -1237,7 +1190,6 @@
 106.10.146.52/31	permit
 106.10.146.224/30	permit
 106.10.146.228/31	permit
-106.10.148.0/24	permit
 106.10.148.48/30	permit
 106.10.148.52/31	permit
 106.10.148.68/30	permit
@@ -1250,7 +1202,6 @@
 106.10.149.30	permit
 106.10.149.160/30	permit
 106.10.149.164/31	permit
-106.10.150.0/23	permit
 106.10.150.23	permit
 106.10.150.24/30	permit
 106.10.150.28/31	permit
@@ -1289,7 +1240,6 @@
 106.10.151.250/31	permit
 106.10.151.252/31	permit
 106.10.151.254	permit
-106.10.167.0/24	permit
 106.10.167.72	permit
 106.10.167.128/27	permit
 106.10.167.160/28	permit
@@ -1311,7 +1261,6 @@
 106.10.174.120/30	permit
 106.10.174.154/31	permit
 106.10.174.156/30	permit
-106.10.176.0/24	permit
 106.10.176.32/29	permit
 106.10.176.48	permit
 106.10.176.112	permit
@@ -1330,7 +1279,6 @@
 106.10.196.43	permit
 106.10.196.44/30	permit
 106.10.196.48	permit
-106.10.240.0/22	permit
 106.10.240.0/24	permit
 106.10.241.0/24	permit
 106.10.242.0/24	permit
@@ -1338,6 +1286,7 @@
 106.10.244.0/24	permit
 106.39.212.64/29	permit
 106.50.16.0/28	permit
+107.20.210.250	permit
 108.174.0.0/24	permit
 108.174.0.215	permit
 108.174.3.0/24	permit
@@ -1356,7 +1305,6 @@
 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
 116.214.12.56/31	permit
@@ -1375,7 +1323,6 @@
 121.244.91.48	permit
 122.15.156.182	permit
 123.126.78.64/29	permit
-124.108.96.0/24	permit
 124.108.96.24/31	permit
 124.108.96.28/31	permit
 124.108.96.70/31	permit
@@ -1488,6 +1435,7 @@
 148.105.0.0/16	permit
 148.105.8.0/21	permit
 149.72.0.0/16	permit
+149.72.223.204	permit
 149.72.248.236	permit
 149.97.173.180	permit
 150.230.98.160	permit
@@ -1545,7 +1493,6 @@
 161.71.64.0/20	permit
 162.247.216.0/22	permit
 163.47.180.0/22	permit
-163.47.180.0/23	permit
 163.114.130.16	permit
 163.114.132.120	permit
 164.177.132.168	permit
@@ -1572,8 +1519,6 @@
 167.89.75.164	permit
 167.89.101.2	permit
 167.89.101.192/28	permit
-167.216.129.210	permit
-167.216.131.180	permit
 167.220.67.232/29	permit
 168.138.5.36	permit
 168.138.73.51	permit
@@ -1585,6 +1530,7 @@
 169.148.131.0/24	permit
 169.148.142.10	permit
 169.148.144.0/25	permit
+169.148.144.10	permit
 170.10.68.0/22	permit
 170.10.128.0/24	permit
 170.10.129.0/24	permit
@@ -1622,8 +1568,7 @@
 182.50.76.0/22	permit
 182.50.78.64/28	permit
 183.240.219.64/29	permit
-185.4.120.0/23	permit
+185.4.120.0/22	permit
-185.4.122.0/24	permit
 185.12.80.0/22	permit
 185.58.84.93	permit
 185.80.93.204	permit
@@ -1633,9 +1578,6 @@
 185.189.236.0/22	permit
 185.211.120.0/22	permit
 185.250.236.0/22	permit
-185.250.239.148	permit
-185.250.239.168	permit
-185.250.239.190	permit
 188.125.68.132	permit
 188.125.68.152/31	permit
 188.125.68.156	permit
@@ -1646,7 +1588,6 @@
 188.125.68.184	permit
 188.125.68.186	permit
 188.125.68.192	permit
-188.125.69.0/24	permit
 188.125.69.105	permit
 188.125.69.110	permit
 188.125.69.112	permit
@@ -1689,9 +1630,6 @@
 192.0.64.0/18	permit
 192.18.139.154	permit
 192.30.252.0/22	permit
-192.64.236.0/24	permit
-192.64.237.0/24	permit
-192.64.238.0/24	permit
 192.161.144.0/20	permit
 192.162.87.0/24	permit
 192.237.158.0/23	permit
@@ -1729,7 +1667,6 @@
 198.37.144.0/20	permit
 198.37.152.186	permit
 198.61.254.0/23	permit
-198.61.254.21	permit
 198.61.254.231	permit
 198.178.234.57	permit
 198.244.48.0/20	permit
@@ -1772,7 +1709,6 @@
 203.188.194.251	permit
 203.188.195.240/30	permit
 203.188.195.244/31	permit
-203.188.197.0/24	permit
 203.188.197.193	permit
 203.188.197.194/31	permit
 203.188.197.196/30	permit
@@ -1782,7 +1718,6 @@
 203.188.197.216/29	permit
 203.188.197.232/29	permit
 203.188.197.240/29	permit
-203.188.200.0/24	permit
 203.188.200.56/31	permit
 203.188.200.58	permit
 203.188.200.60/30	permit
@@ -1802,7 +1737,6 @@
 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
@@ -1867,11 +1801,7 @@
 208.43.21.28/30	permit
 208.43.21.64/29	permit
 208.43.21.72/30	permit
-208.46.212.80	permit
-208.46.212.208/31	permit
-208.46.212.210	permit
 208.64.132.0/22	permit
-208.71.40.0/24	permit
 208.71.40.63	permit
 208.71.40.64/31	permit
 208.71.40.174/31	permit
@@ -1890,7 +1820,6 @@
 208.71.41.172/31	permit
 208.71.41.188/30	permit
 208.71.41.192/31	permit
-208.71.42.0/24	permit
 208.71.42.190/31	permit
 208.71.42.192/28	permit
 208.71.42.208/30	permit
@@ -1898,10 +1827,9 @@
 208.71.42.214	permit
 208.72.249.240/29	permit
 208.74.204.0/22	permit
+208.74.204.5	permit
 208.74.204.9	permit
 208.75.120.0/22	permit
-208.75.121.246	permit
-208.75.122.246	permit
 208.82.237.96/29	permit
 208.82.237.104/31	permit
 208.82.238.96/29	permit
@@ -1914,16 +1842,11 @@
 209.46.117.168	permit
 209.46.117.179	permit
 209.61.151.0/24	permit
-209.61.151.236	permit
-209.61.151.249	permit
-209.61.151.251	permit
 209.67.98.46	permit
 209.67.98.59	permit
 209.85.128.0/17	permit
-212.82.96.0/24	permit
 212.82.96.32/27	permit
 212.82.96.64/29	permit
-212.82.98.0/24	permit
 212.82.98.32/29	permit
 212.82.98.64/27	permit
 212.82.98.96/30	permit
@@ -2005,7 +1928,6 @@
 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
 216.39.60.156/30	permit
 216.39.60.160/30	permit
@@ -2023,7 +1945,6 @@
 216.39.61.170	permit
 216.39.61.175	permit
 216.39.61.238/31	permit
-216.39.62.0/24	permit
 216.39.62.32/28	permit
 216.39.62.48/29	permit
 216.39.62.56/30	permit
@@ -2043,7 +1964,6 @@
 216.98.158.0/24	permit
 216.99.5.67	permit
 216.99.5.68	permit
-216.109.114.0/24	permit
 216.109.114.32/27	permit
 216.109.114.64/29	permit
 216.113.160.0/24	permit

data/conf/rspamd/local.d/options.inc

@@ -6,3 +6,4 @@ disable_monitoring = true;
 # In case a task times out (like DNS lookup), soft reject the message
 # instead of silently accepting the message without further processing.
 soft_reject_on_timeout = true;
+local_addrs = /etc/rspamd/custom/mailcow_networks.map;

data/conf/rspamd/lua/rspamd.local.lua

@@ -621,10 +621,24 @@ rspamd_config:register_symbol({
                   local nct = string.format('%s: %s/%s; charset=utf-8',
                       'Content-Type', rewrite.new_ct.type, rewrite.new_ct.subtype)
                   out[#out + 1] = nct
+                  -- update Content-Type header
+                  task:set_milter_reply({
+                    remove_headers = {['Content-Type'] = 0},
+                  })
+                  task:set_milter_reply({
+                    add_headers = {['Content-Type'] = string.format('%s/%s; charset=utf-8', rewrite.new_ct.type, rewrite.new_ct.subtype)}
+                  })
                   return
                 elseif name:lower() == 'content-transfer-encoding' then
                   out[#out + 1] = string.format('%s: %s',
                       'Content-Transfer-Encoding', 'quoted-printable')
+                  -- update Content-Transfer-Encoding header
+                  task:set_milter_reply({
+                    remove_headers = {['Content-Transfer-Encoding'] = 0},
+                  })
+                  task:set_milter_reply({
+                    add_headers = {['Content-Transfer-Encoding'] = 'quoted-printable'}
+                  })
                   seen_cte = true
                   return
                 end

data/conf/sogo/sogo.conf

@@ -16,6 +16,9 @@
     SOGoFoldersSendEMailNotifications = YES;
     SOGoForwardEnabled = YES;
 
+    // Option to set Users as admin to globally manage calendar permissions etc. Disabled by default
+    // SOGoSuperUsernames = ("moo@example.com");
+
     SOGoUIAdditionalJSFiles = (
       js/theme.js,
       js/custom-sogo.js
@@ -38,6 +41,7 @@
 
     SOGoLanguage = English;
     SOGoMailAuxiliaryUserAccountsEnabled = YES;
+    // SOGoCreateIdentitiesDisabled = NO;
     SOGoMailCustomFromEnabled = YES;
     SOGoMailingMechanism = smtp;
     SOGoSMTPAuthenticationType = plain;

data/web/inc/footer.inc.php

@@ -12,7 +12,8 @@ $alertbox_log_parser = alertbox_log_parser($_SESSION);
 $alerts = [];
 if (is_array($alertbox_log_parser)) {
   foreach ($alertbox_log_parser as $log) {
-    $message = strtr($log['msg'], ["\n" => '', "\r" => '', "\t" => '<br>']);
+    $message = htmlspecialchars($log['msg'], ENT_QUOTES);
+    $message = strtr($message, ["\n" => '', "\r" => '', "\t" => '<br>']);
     $alerts[trim($log['type'], '"')][] = trim($message, '"');
   }
   $alert = array_filter(array_unique($alerts));

data/web/inc/functions.rspamd.inc.php

@@ -143,6 +143,7 @@ function rspamd_maps($_action, $_data = null) {
         return false;
       }
       $maps = (array)$_data['map'];
+      $valid_maps = array();
       foreach ($maps as $map) {
         foreach ($RSPAMD_MAPS as $rspamd_map_type) {
           if (!in_array($map, $rspamd_map_type)) {
@@ -151,9 +152,12 @@ function rspamd_maps($_action, $_data = null) {
               'log' => array(__FUNCTION__, $_action, '-'),
               'msg' => array('global_map_invalid', $map)
             );
-            continue;
+          } else {
+            array_push($valid_maps, $map);
           }
         }
+      }
+      foreach ($valid_maps as $map) {
         try {
           if (file_exists('/rspamd_custom_maps/' . $map)) {
             $map_content = trim($_data['rspamd_map_data']);

data/web/inc/init_db.inc.php

@@ -3,7 +3,7 @@ function init_db_schema() {
   try {
     global $pdo;
 
-    $db_version = "09022024_1433";
+    $db_version = "26022024_1433";
 
     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -979,6 +979,18 @@ function init_db_schema() {
         ),
         "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
       ),
+      "sogo_admin" => array(
+        "cols" => array(
+          "c_key" => "VARCHAR(255) NOT NULL DEFAULT ''",
+          "c_content"  => "mediumtext NOT NULL",
+        ),
+        "keys" => array(
+          "primary" => array(
+            "" => array("c_key")
+          )
+        ),
+        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
+      ),      
       "pushover" => array(
         "cols" => array(
           "username" => "VARCHAR(255) NOT NULL",

data/web/inc/vars.inc.php

@@ -95,6 +95,7 @@ $AVAILABLE_LANGUAGES = array(
   'it-it' => 'Italiano (Italian)',
   'ko-kr' => '한국어 (Korean)',
   'lv-lv' => 'latviešu (Latvian)',
+  'lt-lt' => 'Lietuvių (Lithuanian)',
   'nb-no' => 'Norsk (Norwegian)',
   'nl-nl' => 'Nederlands (Dutch)',
   'pl-pl' => 'Język Polski (Polish)',

data/web/json_api.php

@@ -47,6 +47,12 @@ function api_log($_data) {
   }
 }
 
+// Block requests not intended for direct API use by checking the 'Sec-Fetch-Dest' header.
+if (isset($_SERVER['HTTP_SEC_FETCH_DEST']) && $_SERVER['HTTP_SEC_FETCH_DEST'] !== 'empty') {
+  header('HTTP/1.1 403 Forbidden');
+  exit;
+}
+
 if (isset($_GET['query'])) {
 
   $query = explode('/', $_GET['query']);

data/web/lang/lang.es-es.json

@@ -22,7 +22,9 @@
         "app_passwds": "Gestionar las contraseñas de aplicaciones",
         "domain_desc": "Cambiar descripción del dominio",
         "protocol_access": "Cambiar protocolo de acceso",
-        "quarantine_category": "Cambiar categoría de las notificaciones de cuarentena"
+        "quarantine_category": "Cambiar categoría de las notificaciones de cuarentena",
+        "domain_relayhost": "Cambiar relayhost por un dominio",
+        "extend_sender_acl": "Permitir extender la ACL del remitente por direcciones externas"
     },
     "add": {
         "activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",

data/web/lang/lang.fr-fr.json

@@ -52,7 +52,7 @@
         "delete2duplicates": "Supprimer les doubles à destination",
         "description": "Description",
         "destination": "Destination",
-        "disable_login": "Désactiver l'authentification (les mails entrants resteront acceptés)",
+        "disable_login": "Désactiver l'authentification (les e-mails entrants resteront acceptés)",
         "domain": "domaine",
         "domain_matches_hostname": "Le domaine %s correspond à la machine (hostname)",
         "domain_quota_m": "Quota total du domaine (Mo)",
@@ -170,7 +170,7 @@
         "domain_s": "Domaine(s)",
         "duplicate": "Dupliquer",
         "duplicate_dkim": "Dupliquer l'enregistrement DKIM",
-        "edit": "Editer",
+        "edit": "Éditer",
         "empty": "Aucun résultat",
         "excludes": "Exclure ces destinataires",
         "f2b_ban_time": "Durée du bannissement (s)",
@@ -352,7 +352,7 @@
         "app_passwd_id_invalid": "Le mot de passe ID %s de l'application est non valide",
         "bcc_empty": "La destination BCC destination ne peut pas être vide",
         "bcc_exists": "Une carte de transport BCC %s existe pour le type %s",
-        "bcc_must_be_email": "Le destination BCC %s n'est pas une adresse mail valide",
+        "bcc_must_be_email": "Le destination BCC %s n'est pas une adresse e-mail valide",
         "comment_too_long": "Le commentaire est trop long, 160 caractère max sont permis",
         "defquota_empty": "Le quota par défaut par boîte ne doit pas être 0.",
         "description_invalid": "La description des ressources pour %s est non valide",
@@ -503,7 +503,7 @@
     "edit": {
         "active": "Actif",
         "advanced_settings": "Réglages avancés",
-        "alias": "Editer les alias",
+        "alias": "Éditer les alias",
         "allow_from_smtp": "Restreindre l'utilisation de <b>SMTP</b> à ces adresses IP",
         "allow_from_smtp_info": "Laissez vide pour autoriser tous les expéditeurs.<br>Adresses IPv4/IPv6 et réseaux.",
         "allowed_protocols": "Protocoles autorisés",
@@ -521,12 +521,12 @@
         "delete_ays": "Veuillez confirmer le processus de suppression.",
         "description": "Description",
         "disable_login": "Refuser l’ouverture de session (le courrier entrant est toujours accepté)",
-        "domain": "Edition du domaine",
+        "domain": "Édition du domaine",
-        "domain_admin": "Edition de l'administrateur du domaine",
+        "domain_admin": "Édition de l'administrateur du domaine",
         "domain_quota": "Quota du domaine",
         "domains": "Domaines",
         "dont_check_sender_acl": "Désactiver la vérification de l’expéditeur pour le domaine %s (+ alias de domaines)",
-        "edit_alias_domain": "Edition des alias de domaine",
+        "edit_alias_domain": "Édition des alias de domaine",
         "encryption": "Cryptage",
         "exclude": "Exclure des objets (regex)",
         "extended_sender_acl": "Adresses de l’expéditeur externe",
@@ -542,7 +542,7 @@
         "inactive": "Inactif",
         "kind": "Type",
         "last_modified": "Dernière modification",
-        "mailbox": "Edition de la boîte mail",
+        "mailbox": "Édition de la boîte mail",
         "mailbox_quota_def": "Quota par défaut de la boîte",
         "max_aliases": "Nombre max. d'alias",
         "max_mailboxes": "Nombre max. de boîtes possibles",
@@ -598,7 +598,7 @@
         "target_domain": "Domaine cible",
         "timeout1": "Délai de connexion à l’hôte distant",
         "timeout2": "Délai de connexion à l’hôte local",
-        "title": "Editer l'objet",
+        "title": "Éditer l'objet",
         "unchanged_if_empty": "Si non modifié, laisser en blanc",
         "username": "Nom d'utilisateur",
         "validate_save": "Valider et sauver",
@@ -699,7 +699,7 @@
         "domain_quota": "Quota",
         "domain_quota_total": "Quota total du domaine",
         "domains": "Domaines",
-        "edit": "Editer",
+        "edit": "Éditer",
         "empty": "Pas de résulats",
         "enable_x": "Activer",
         "excludes": "Exclut",
@@ -1091,7 +1091,7 @@
         "sync_jobs": "Jobs de synchronisation",
         "tag_handling": "Régler la manipulation du courrier étiqueté",
         "tag_help_example": "Exemple pour une adresse e-mail étiquetée : me<b>+Facebook</b>@example.org",
-        "tag_help_explain": "Dans un sous-dossier : un nouveau sous-dossier nommé selon l'étiquette sera créé sous INBOX (\"INBOX/Facebook\").<br>\nDans le sujet : le nom des balises sera ajouté au début du sujet du mail, exemple : \"[Facebook] My News\".",
+        "tag_help_explain": "Dans un sous-dossier : un nouveau sous-dossier nommé selon l'étiquette sera créé sous INBOX (\"INBOX/Facebook\").<br>\nDans le sujet : le nom des balises sera ajouté au début du sujet de l'e-mail, exemple : \"[Facebook] My News\".",
         "tag_in_none": "Ne rien faire",
         "tag_in_subfolder": "Dans un sous dossier",
         "tag_in_subject": "Dans le sujet",

data/web/lang/lang.lt-lt.json

@@ -0,0 +1,354 @@
+{
+    "acl": {
+        "app_passwds": "Tvarkyti programėlių slaptažodžius",
+        "bcc_maps": "BCC žemėlapiai",
+        "domain_desc": "Keisti domeno aprašymą",
+        "eas_reset": "Išvalyti EAS įrenginius",
+        "filters": "Filtrai",
+        "login_as": "Prisijungti kaip elektroninio pašto naudotojas",
+        "protocol_access": "Keisti protokolų prieigą",
+        "quarantine": "Karantino valdymas",
+        "quarantine_category": "Keisti karantino pranešimo katrgoriją",
+        "quarantine_notification": "Keisti karantino pranešimus",
+        "ratelimit": "Prieigos limitas",
+        "recipient_maps": "Gavėjų sąsajos",
+        "smtp_ip_access": "Pakeisti prieinamuosius SMTP serverius",
+        "sogo_access": "Leisti SOGo prieigos valdymą",
+        "spam_policy": "Juodasis/Baltasis sąrašas",
+        "spam_score": "Šlamsto balas",
+        "tls_policy": "TLS politika",
+        "unlimited_quota": "Neribota elektroninio pašto dėžudžių kvota",
+        "quarantine_attachments": "Karantino priedai",
+        "sogo_profile_reset": "Nustatyti SOGo profilį iš naujo",
+        "alias_domains": "Pridėti pakaitinius domenus",
+        "delimiter_action": "Delimitatoriaus veiksmas",
+        "domain_relayhost": "Pakeisti peradresavimo serverį domenui",
+        "extend_sender_acl": "Leisti išplėsti siuntėjo ACL išoriniais adresais",
+        "mailbox_relayhost": "Pakeisti siuntimo serverį pašto dėžutei",
+        "prohibited": "Draudžiama pagal ACL",
+        "spam_alias": "Laikini slapyvardžiai",
+        "syncjobs": "Sinchronizuoti darbus"
+    },
+    "add": {
+        "active": "Aktyvus",
+        "add": "Pridėti",
+        "add_domain_only": "Pridėti tik domeną",
+        "add_domain_restart": "Pridėti domeną ir paleisti SOGo iš naujo",
+        "alias_domain_info": "<small>Tik tinkami domenų vardai (išskirta kableliais).</small>",
+        "app_name": "Programėlės pavadinimas",
+        "app_password": "Pridėti programėlės slaptažodį",
+        "app_passwd_protocols": "Prieinamieji programėlės slaptažodžio protokolai",
+        "custom_params": "Pasirinktiniai parametrai",
+        "delete1": "Ištrinti iš šaltinio, kai baigta",
+        "activate_filter_warn": "Visi kiti filtrai bus deaktivuoti, kai „aktyvus“ yra pražymėtas.",
+        "custom_params_hint": "Teisingai: --param=xy, neteisingai: --param xy",
+        "description": "Aprašymas",
+        "destination": "Gavėjas",
+        "domain": "Domenas",
+        "domain_quota_m": "Viso domeno kvota (MiB)",
+        "dry": "Simuliuoti sinchronizaciją",
+        "enc_method": "Šifravimo metodas",
+        "full_name": "Prilnas vardas",
+        "generate": "generuoti",
+        "goto_null": "Tyliai atmesti žinutes",
+        "goto_spam": "Išmokti kaip <span class=\"text-danger\"><b>šlamštas</b></span>",
+        "password": "Slaptažodis",
+        "select": "Pasirinkite...",
+        "select_domain": "Prima, pasirinkite domeną",
+        "sieve_desc": "Trumpas aprašymas",
+        "sieve_type": "Filtro tipas",
+        "mailbox_quota_def": "Numatytoji elelktroninio pašto dėžutės kvota",
+        "password_repeat": "Slaptažodžio patvirtininas (pakartoti)",
+        "disable_login": "Uždrausti prisijungimą (ateinančios žinutės vistiek bus gaunamos)",
+        "inactive": "Neaktyvus",
+        "alias_address": "Pakaitiniai/is adresai/as",
+        "alias_address_info": "<small>Pilnas el. pašto adresas (-ai) arba @example.com, kad gautumėte visus pranešimus iš domeno (atskirtus kableliais). <b>Tik \"mailcow\" domenai</b>.</small>",
+        "alias_domain": "Pakaitinis domenas",
+        "automap": "Stenktis automatiškai susieti aplankus (\"Išsiųsti\", \"Išsiųsti\" => \"išsiųsti\" ir tt.)",
+        "backup_mx_options": "Perdavimo nustatymai",
+        "bcc_dest_format": "BCC gavimo adresas turi būti vienas galiojantis el. pašto adresas.<br>Jei turite siųsti kopiją į kelis adresus, sukurkite slapyvardį ir naudokite jį čia.",
+        "delete2": "Ištrinti žinutes gavimo vietoje, kurios nėra šaltinyje.",
+        "delete2duplicates": "Ištrinti dublikatus gavimo vietoje",
+        "domain_matches_hostname": "Domenas %s atitinka serverio vardą",
+        "exclude": "Išskirti objektus (regex)",
+        "gal": "Visuotinis adresų sąrašas",
+        "gal_info": "GAL (Global Address List) apima visus domeno objektus ir jų negali redaguoti joks vartotojas. SOGo trūksta laisvosios/užimtosios informacijos, jei tai išjungta! <b>Perkraukite SOGo, kad pritaikytumėte pakeitimus.</b>"
+    },
+    "admin": {
+        "access": "Prieiga",
+        "active": "Aktyvus",
+        "add": "Pridėti",
+        "add_admin": "Pridėti administratorių",
+        "add_domain_admin": "Pridėti domeno administratorių",
+        "add_settings_rule": "Pridėti nustatymų taisyklę",
+        "admin": "Administratorius",
+        "admins": "Administratoriai",
+        "admins_ldap": "LDAP administratoriai",
+        "api_key": "API prieigos raktas",
+        "copy_to_clipboard": "Tekstas nukopijuotas!",
+        "cors_settings": "CORS nustatymai",
+        "dkim_from": "Iš",
+        "dkim_key_length": "DKIM rakto ilgis (bitai)",
+        "dkim_key_valid": "Raktas tinkamas",
+        "dkim_keys": "ARC/DKIM raktai",
+        "dkim_private_key": "Slaptasis raktas",
+        "dkim_to": "Į",
+        "domain": "Domenas",
+        "domain_admin": "Domeno administratorius",
+        "domain_admins": "Doneno administratoriai",
+        "domain_s": "Domenas/ai",
+        "duplicate": "Dublikatas",
+        "duplicate_dkim": "Dublikuotas DKIM įrašas",
+        "edit": "Redaguoti",
+        "empty": "Jokių rezultatų",
+        "f2b_filter": "Regex filtrai",
+        "filter_table": "Filtrų lentelė",
+        "from": "Nuo",
+        "generate": "generuoti",
+        "html": "HTML",
+        "import": "Importuoti",
+        "inactive": "Neaktyvus",
+        "message": "Žinutė",
+        "message_size": "Žinutės dydis",
+        "nexthop": "Kitas šuolis",
+        "no": "&#10005;",
+        "no_record": "Nėra įrašo",
+        "oauth2_apps": "OAuth2 Programėlės",
+        "oauth2_add_client": "Pridėti OAuth2 klientą",
+        "oauth2_client_id": "Kliento ID",
+        "optional": "pasirinktinas",
+        "options": "Nustatymai",
+        "password": "Slaptažodis",
+        "password_length": "Slaptažodžio ilgis",
+        "password_policy_chars": "Privalo turėti bent vieną numerį ar skaičių",
+        "password_policy_length": "Mažiausias slaptažodžio ilgis - %d",
+        "password_policy_numbers": "Privalo turėti bent vieną skaičių",
+        "password_policy_special_chars": "Privalo turėti specialiųjų ženklų",
+        "password_repeat": "Slaptažodžio patvirtinimas (pakartoti)",
+        "quarantine": "Karantinas",
+        "quarantine_notification_sender": "Pranešimų e-pašto siuntėjas",
+        "quarantine_release_format_att": "Kaip priedą",
+        "quarantine_release_format_raw": "Nepakeitas originalas",
+        "quota_notifications": "Kvotos pranešimai",
+        "r_active": "Aktyvūs apribojimai",
+        "r_inactive": "Neaktyvus apribojimai",
+        "refresh": "Perkrauti",
+        "regen_api_key": "Regeneruoti API raktą",
+        "relay_rcpt": "„Kam:“ adresas",
+        "relay_run": "Paleisti testą",
+        "remove": "Ištrinti",
+        "rsetting_add_rule": "Pridėti taisyklę",
+        "rsetting_desc": "Trumpas aprašymas",
+        "rspamd_global_filters_agree": "Aš busiu atsargus/i!",
+        "save": "Išsaugoti pakeitimus",
+        "search_domain_da": "Ieškoti domenus",
+        "send": "Siųsti",
+        "sender": "Siuntėjas",
+        "source": "Šaltinis",
+        "spamfilter": "Šlamšto filtras",
+        "text": "Tekstas",
+        "time": "Laikas",
+        "to_top": "Atgal į viršų",
+        "ui_header_announcement_content": "Tekstas (HTML leistina)",
+        "ui_header_announcement_select": "Pasirinkite pranešimo tipą",
+        "ui_header_announcement_type": "Tipas",
+        "ui_header_announcement_type_danger": "Labai svarbus",
+        "ui_header_announcement_type_info": "Info",
+        "upload": "Įkelti",
+        "username": "Naudotojo vardas",
+        "verify": "Patikrinti",
+        "yes": "&#10003;",
+        "customer_id": "Kliento ID",
+        "f2b_parameters": "„Fail2Ban“ parametrai",
+        "import_private_key": "Importuoti slaptąjį raktą",
+        "action": "Veiksmas",
+        "convert_html_to_text": "Konvertuoti HTML į paprastą tekstą",
+        "oauth2_renew_secret": "Geberuoti naują kliento slapuką",
+        "private_key": "Slaptasis raktas",
+        "sal_level": "Moo lygis",
+        "ui_header_announcement_type_warning": "Svarbus",
+        "admin_details": "Redaguoti administratoriaus duomenis",
+        "login_time": "Prisijungino laikas",
+        "ui_header_announcement": "Pranešimai",
+        "dkim_overwrite_key": "Perrašyti egzistuojantį DKIK raktą",
+        "f2b_whitelist": "Tinklai baltajama sąraše",
+        "f2b_blacklist": "Tinklai juodajame saraše",
+        "loading": "Prašau palaukite...",
+        "password_policy_lowerupper": "Privalo turėti mažuosius ir didžiuosius ženklus/raides",
+        "relay_from": "„Nuo:“ adresas"
+    },
+    "danger": {
+        "demo_mode_enabled": "Demo Režimas įjungtas",
+        "description_invalid": "Resurso %s aprašymas yra netinkamas",
+        "domain_exists": "Domenas %s jau egzistuoja",
+        "domain_invalid": "Domeno vardas tuščias arba netinkamas",
+        "domain_not_found": "Domenas %s nerastas",
+        "domain_quota_m_in_use": "Domeno kvota turi būti daygiau arba lygiai %s MiB",
+        "file_open_error": "Failas negali būti atidarytas įrašymui",
+        "filter_type": "Netinkamas filtro tipas",
+        "invalid_mime_type": "Netinkamas MIME tipas",
+        "login_failed": "Prisijungimas nepavyko",
+        "mailbox_defquota_exceeds_mailbox_maxquota": "Numatytoji kvota didesnė nei maksimalus kvotos limitas",
+        "mysql_error": "MySQL problema: %s",
+        "img_invalid": "Negalimas nuotraukos patikrinimas",
+        "mailbox_quota_left_exceeded": "Per mažai vietos diske (liko %d MiB)",
+        "comment_too_long": "Komentaeas per ilgas, maksimalus leistinas simbolių skaičius yra 160",
+        "nginx_reload_failed": "Nginx perkrovimas nepavyko: %s",
+        "invalid_filter_type": "Netinkamas filtro tipas"
+    },
+    "edit": {
+        "validate_save": "Patikrinti ir išsaugoti",
+        "unchanged_if_empty": "Jei nepakeista, palikite tuščią",
+        "username": "Naudotojo vardas"
+    },
+    "fido2": {
+        "confirm": "Patvirtinti",
+        "fido2_success": "Įrenginys sėkmingai užregistruotas",
+        "fido2_validation_failed": "Patikrinimas nepavyko",
+        "fn": "Draugiškasis vardas",
+        "known_ids": "Žinomi ID",
+        "none": "Neįgalintas",
+        "register_status": "Registracijos statusas",
+        "rename": "Pervadyti",
+        "set_fido2_touchid": "Registruokite Touch ID su Apple M1",
+        "set_fn": "Nustatyti draugiškąjį vardą",
+        "start_fido2_validation": "Pradėti FIDO2 patikrinimą",
+        "fido2_auth": "Prisijungti su FIDO2",
+        "set_fido2": "Registruoti FIDO2 įrengenį"
+    },
+    "footer": {
+        "cancel": "Atšaukti",
+        "confirm_delete": "Patvirtinti trynimą",
+        "delete_now": "Ištrinti dabar",
+        "hibp_check": "Patikrinti naudodami haveibeenpwned.com",
+        "hibp_nok": "Atitikta! Tai yra galimai pavojingas slaptažodis!",
+        "hibp_ok": "Nerasta jokių atitikmenų.",
+        "loading": "Prašome palaukti...",
+        "nothing_selected": "Niekas nepasirinkta",
+        "restart_container": "Paleiskite konteinerį iš naujo",
+        "restart_now": "Perkrauti dabar",
+        "restarting_container": "Perkraunamas konteineris, tai gali užtrukti.",
+        "delete_these_items": "Prašome patvirtinti savo pakeitimus šiam objekto ID",
+        "restart_container_info": "<b>Svarbu:</b> Sklandus paleidimas iš naujo gali užtrukti, prašome palaukti, kol jis baigsis."
+    },
+    "header": {
+        "administration": "Konfigūracija ir detalės",
+        "apps": "Programėlės",
+        "debug": "Informacija",
+        "email": "El. paštas",
+        "mailcow_system": "Sistema",
+        "mailcow_config": "Konfiguracija",
+        "quarantine": "Karantinas",
+        "restart_netfilter": "Paleisti „netfilter“ iš naujo",
+        "restart_sogo": "Paleisti SOGo iš naujo",
+        "user_settings": "Naudotojo Nustatymai"
+    },
+    "info": {
+        "no_action": "Nėra taikomų veiksmų",
+        "session_expires": "Jūsų sesija pasibaigs už maždaug 15 sekundžių.",
+        "awaiting_tfa_confirmation": "Laukiama DFA patvirtinimo"
+    },
+    "login": {
+        "fido2_webauthn": "FIDO2/WebAuthn Prisijungimas",
+        "login": "Prisijungti",
+        "other_logins": "Prisijungimas raktu",
+        "password": "Slaptažodis",
+        "username": "Naudotojo vardas",
+        "mobileconfig_info": "Prašome prisijungti kaip pašto dėžutės vartotojui, kad galėtumėte atsisiųsti pageidaujamą „Apple“ ryšio profilį."
+    },
+    "mailbox": {
+        "action": "Veiksmas",
+        "activate": "Aktivuoti",
+        "active": "Aktyvus",
+        "add": "Pridėti",
+        "add_alias": "Pridėti pseudonimą",
+        "add_alias_expand": "Išplėsti pseudonimą per pseudonimų domenus",
+        "add_bcc_entry": "Pridėti BCC žemėlapį",
+        "add_domain": "Pridėti domeną",
+        "add_domain_alias": "Pridėti pakaitinį domeną",
+        "add_domain_record_first": "Prašome pridėti domeną pirmiausia",
+        "add_filter": "Pridėti filtrą",
+        "add_mailbox": "Pridėti pašto dėžutę",
+        "add_recipient_map_entry": "Pridėti gavėjų žemėlapį",
+        "add_resource": "Pridėti resursą",
+        "add_template": "Pridėti Šabloną",
+        "add_tls_policy_map": "Pridėti TLS politikos schemą",
+        "address_rewriting": "Adresų perrašymas",
+        "alias": "Slapyvardis",
+        "alias_domain_backupmx": "Pakaitinis domenas nėra aktyvuotas peradresavimo domenui",
+        "all_domains": "Visi Domenai",
+        "allow_from_smtp_info": "Palikite tuščią, norėdami leisti visiems siuntėjams.<br>IPv4/IPv6 adresai ir tinklai.",
+        "backup_mx": "Peradresavimo domenas",
+        "bcc": "BCC",
+        "bcc_destination": "BCC gavimo vieta",
+        "bcc_destinations": "BCC gavimo vieta",
+        "bcc_local_dest": "Vietinė gavimo vieta",
+        "bcc_map": "BCC žemėlapis",
+        "bcc_map_type": "BCC tipas",
+        "bcc_maps": "BCC žemėlapiai",
+        "bcc_type": "BCC tipas",
+        "booking_null": "Visada rodyti kaip laisvą",
+        "booking_0_short": "Visada laisvas",
+        "booking_custom": "Nekintamasis apribojimas pagal individualią užsakymų sumą",
+        "booking_custom_short": "Nekintamasis ribojimas",
+        "booking_ltnull": "Neribotas, bet rodyti kaip užimtas, kai užrezervuota",
+        "booking_lt0_short": "Kintamasis apribojimas",
+        "catch_all": "Viską sugriebiantis",
+        "daily": "Kasdien",
+        "description": "Aprašymas",
+        "disable_login": "Uždrausti prisijungimą (gaunami el. laiškai vis dar priimami)",
+        "disable_x": "Išjungti",
+        "dkim_key_length": "DKIM rakto ilgis (bitai)",
+        "domain": "Domenas",
+        "domain_aliases": "Pakaitomieji domenai",
+        "domain_templates": "Domenų Šablonai",
+        "domain_quota": "Kvota",
+        "domain_quota_total": "Bendroji domeno kvota",
+        "domains": "Domenai",
+        "edit": "Redaguoti",
+        "filters": "Filtrai",
+        "fname": "Pilnas vardas",
+        "gal": "Visuotinis adresų sąrašas",
+        "goto_spam": "Išmokti kaip <b>šlamštas</b>",
+        "hourly": "Kas valandą",
+        "in_use": "Naudojimas (%)",
+        "inactive": "Neaktyvus",
+        "allowed_protocols": "Leidžiami protokolai tiesioginiam vartotojo prieigai (neturi įtakos programėlių slaptažodžių protokolams)",
+        "goto_ham": "Išmokti kaip <b>ham</b>",
+        "aliases": "Pseudonimai",
+        "allow_from_smtp": "Leiskite tik šiems IP naudotis <b>SMTP</b>",
+        "alias_domain_alias_hint": "Pseudonimai <b>nėra</b> taikomi domeno pseudonimams automatiškai. Pseudonimo adresas <code>my-alias@domain</code> <b>neapima</b> adreso <code>my-alias@alias-domain</code> (kur \"alias-domain\" yra įsivaizduojamas \"domain\" pseudonimas).<br>Prašome naudoti sieve filtrą, kad nukreiptumėte laiškus į išorinę pašto dėžutę (žr. skirtuką \"Filtrai\" arba naudokite SOGo -> Peradresavimas). Naudokite \"Išplėsti pseudonimus per pseudonimų sritis\" kad automatiškai pridėti trūkstamus pseudonimus.",
+        "deactivate": "Deaktivuoti",
+        "domain_admins": "Domeno administratoriai",
+        "enable_x": "Įjungti",
+        "last_run_reset": "Suplanuoti kitą",
+        "mailbox": "Pašto dėžutė",
+        "mailbox_defaults": "Numatytieji nustatymai",
+        "mailbox_defaults_info": "Nustatyti numatytuosius nustatymus naujoms pašto dėžutėms.",
+        "mailbox_defquota": "Numatytasis pašto dėžutės dydis",
+        "mailbox_templates": "Pašto dėžučių šablonai",
+        "mailbox_quota": "Maks. pašto dėžutės dydis",
+        "mailboxes": "Pašto dėžutės",
+        "max_aliases": "Maks. slapyvardžiai",
+        "max_mailboxes": "Maks. galimų pašto dėžučių",
+        "max_quota": "Maks. kvota kiekvienai pašto dėžutei",
+        "mins_interval": "Intervalas (min)",
+        "msg_num": "Žinutė #"
+    },
+    "quarantine": {
+        "atts": "Priedaj",
+        "check_hash": "Ieškoti failo Hash'o @ VT",
+        "confirm": "Patvirtinti",
+        "confirm_delete": "Patvirtinti šio elemento trynimą",
+        "danger": "Pavojus"
+    },
+    "success": {
+        "domain_admin_added": "Pridėtas domeno administractorius %s",
+        "domain_admin_removed": "Domeno administratorius %s ištrintas",
+        "domain_modified": "Domeno %s pakitimai išsaugoti",
+        "domain_removed": "Domenas %s ištrintas",
+        "dovecot_restart_success": "„Doveccot“ perkrautas",
+        "domain_added": "Pridėtas domenas %s",
+        "domain_admin_modified": "Pakeitimai domeno adminustratoriui %s išsaugoti"
+    }
+}

data/web/lang/lang.lv-lv.json

@@ -4,7 +4,17 @@
         "filters": "Filtri",
         "recipient_maps": "Saņēmēja kartes",
         "syncjobs": "Sinhronizācijas uzdevumi",
-        "spam_score": "Mēstules novērtējums"
+        "spam_score": "Mēstules novērtējums",
+        "alias_domains": "Pievienot aizstājdomēnus",
+        "spam_alias": "Pagaidu aizstājvārdi",
+        "app_passwds": "Lietotņu paroļu pārvaldība",
+        "delimiter_action": "Atdalītāja darbība",
+        "domain_desc": "Mainīt domēna aprakstu",
+        "domain_relayhost": "Mainīt domēna relayhost",
+        "eas_reset": "EAS ierīču atiestatīšana",
+        "extend_sender_acl": "Ļauj paplašināt sūtītāja ACL ar ārējām adresēm",
+        "login_as": "Pieteikšanās kā pastkastes lietotājam",
+        "mailbox_relayhost": "Pasta kastītes relayhost maiņa"
     },
     "add": {
         "activate_filter_warn": "Visi pārējie filtri tiks deaktivizēti, kad aktīvs ir atzīmēts.",
@@ -12,9 +22,9 @@
         "add": "Pievienot",
         "add_domain_only": "Tikai pievienot domēnu",
         "add_domain_restart": "Pievienot domēnu un restartēt SOGo",
-        "alias_address": "Alias addrese/s",
+        "alias_address": "Aizstājaddrese/s",
         "alias_address_info": "<small>Pilna epasta addrese/s vai @piemērs.com, lai notvertu visas domēna ziņas (komatu atdalītas). <b>tikai mailcow domēni</b>.</small>",
-        "alias_domain": "Alias domēni",
+        "alias_domain": "Aizstājdomēni",
         "alias_domain_info": "<small>Tikai derīgi domēna vārdi (komatu atdalīti).</small>",
         "automap": "Mēģiniet automatizēt mapes (\"Nosūtītie vienumi\", \"Nosūtītie\" => \"Nosūtītie\" etc.)",
         "backup_mx_options": "Dublējuma MX iespējas",
@@ -32,14 +42,14 @@
         "kind": "Veids",
         "mailbox_quota_m": "Maks. kvota pastkastei (MiB)",
         "mailbox_username": "Lietotājvārds (kriesā daļa no epasta adreses)",
-        "max_aliases": "Maks. iespejamās aliases",
+        "max_aliases": "Lielākais pieļaujamo aizstājvārdu skaits",
         "max_mailboxes": "Maks. iespējamās pastkastes",
         "mins_interval": "Aptauajs intervāls (minūtes)",
         "multiple_bookings": "Vairākas rezervācijas",
         "password": "Parole",
         "password_repeat": "Apstiprinājuma parole (atkārtot)",
         "port": "Ports",
-        "post_domain_add": "Jums būs nepieciešams atsāknēt SOGo servisa konteineru pēc jauna domēna pievienošanas!",
+        "post_domain_add": "SOGO konteineru \"sogo-mailcow\" ir nepieciešams pārsāknēt pēc jauna domēna pievienošanas.<br><br>Papildus vajadzētu pārskatīt domēnu DNS konfigurāciju. Tiklīdz DNS konfigurācija ir apstiprināta, jāpārsāknē \"acme-mailcow\", lai automātiski izveidotu sertifikātus jaunajam domēnam (autoconfig.&lt;domain&gt;, autodiscover.&lt;domain&gt;).<br>Šis solis ir izvēles un tiks atkārtots ik pēc 24 stundām.",
         "quota_mb": "Kvota (MiB)",
         "relay_all": "Pārsūtīt visus saņēmējus",
         "relay_all_info": "<small>Ja izvēlies <b>nepārsūtīt</b> visus saņēmējus, tad Tev būs nepieciešams pievienot (\"tukšu\") pastkasti katram saņēmējam, kas būtu jāpārsūta.</small>",
@@ -56,7 +66,8 @@
         "target_domain": "Mērķa domēns",
         "username": "Lietotājvārds",
         "validate": "Apstiprināt",
-        "validation_success": "Apstiprināts veiksmīgi"
+        "validation_success": "Apstiprināts veiksmīgi",
+        "bcc_dest_format": "BCC galamērķim ir jābūt vienai derīgai e-pasta adresei.<br>Ja ir nepieciešams nosūtīt kopiju vairākām adresēm, jāizveido aizstājvārds un jāizmanto tas šeit."
     },
     "admin": {
         "access": "Pieeja",
@@ -118,7 +129,7 @@
         "password_repeat": "Apstiprināt paroli (atkārtot)",
         "private_key": "Privāta atslēga",
         "quarantine": "Karantīna",
-        "quarantine_exclude_domains": "Izslēgt domēnus un alias-domēnus:",
+        "quarantine_exclude_domains": "Neņemt vērā domēnus un aizstājdomēnus",
         "quarantine_max_size": "Maks. izmērs MiB (lielāki vienumi ir atbrīvoti):",
         "quarantine_retention_size": "Atlikumi pastkastēs:",
         "r_active": "Aktīvie ierobežojumi",
@@ -129,7 +140,7 @@
         "regen_api_key": "Reģenerēt API atslēgu",
         "relay_from": "\"No:\" addrese",
         "relay_run": "Palaist testu",
-        "relayhosts_hint": "Definējiet  relejhostus šeit, lai tos varētu izvēlēties domēna konfigurācijas logā.",
+        "relayhosts_hint": "Norādīt no sūtītāja atkarīgas piegādes, lai varētu tos atlasīt domēnu konfigurācijas uzvednē.<br>\n  Piegādes pakalpojums vienmēr ir \"smtp\", tādējādi tiks mēģināts TLS, kad piedāvāts. Iekļautais TLS (SMTPS) netiek atbalstīts. Tiek ņemts vērā lietotāja atsevišķais izejošā TLS nosacījuma iestatījums.<br>\n  Ietekmē atlasītos domēnus, tajā skaitā aizstājdomēnus.",
         "remove": "Noņemt",
         "remove_row": "Noņemt rindu",
         "reset_default": "Atiestatīt uz noklusējumu",
@@ -148,16 +159,19 @@
         "username": "Lietotājvārds",
         "generate": "izveidot",
         "message": "Ziņojums",
-        "last_applied": "Pēdējoreiz pielietots"
+        "last_applied": "Pēdējoreiz pielietots",
+        "f2b_regex_info": "Vērā ņemtie žurnāli: SOGO, Postfix, Dovecot, PHP-FPM",
+        "sys_mails": "Sistēmas pasts",
+        "ip_check_disabled": "IP pārbaude ir atspējota. To var iespējot<br><strong>Sistēma > Konfigurācija > iespējas > Pielāgot</strong>"
     },
     "danger": {
         "access_denied": "Piekļuve liegta, vai nepareizi dati",
-        "alias_domain_invalid": "Alias domēns ir nepareizs",
+        "alias_domain_invalid": "Aizstājdomēns %s ir nederīgs",
-        "alias_empty": "Alias adrese nevar būt tukša",
+        "alias_empty": "Aizstājadrese nedrīkst būt tukša",
-        "alias_goto_identical": "Alias un domēnvārds nevar būt identisks",
+        "alias_goto_identical": "Aizstājvārds un mērķa adrese nedrīkst būt vienādi",
-        "alias_invalid": "Alias adrese nepareiza",
+        "alias_invalid": "Aizstājadrese %s ir nederīga",
-        "aliasd_targetd_identical": "Alias domēns nevar būt vienāds ar mērķa domēnu",
+        "aliasd_targetd_identical": "Aizstājdomēns nedrīkst būt vienāds ar mērķa domēnu: %s",
-        "aliases_in_use": "Maks. aliases jabūt lielākām vai vienādām ar %d",
+        "aliases_in_use": "Pieļaujamajam aizstājvārdu skaitam jābūt lielākam vai vienādam ar %d",
         "description_invalid": "Resursa apraksts ir nederīgs",
         "dkim_domain_or_sel_invalid": "DKIM domēns vai selektors nepareizs",
         "domain_exists": "Domēns %s jau pastāv",
@@ -165,15 +179,15 @@
         "domain_not_empty": "Nevar noņemt neaizpildītu domēnu",
         "domain_not_found": "Domēns %s nav atrasts",
         "domain_quota_m_in_use": "Domēna kvotai jābūt lielākai vai vienādai ar %s MiB",
-        "goto_empty": "Goto adrese nevar būt tukša",
+        "goto_empty": "Aizstājādresei jāsatur vismaz viena derīga mērķa adrese",
         "goto_invalid": "Goto adrese nepareiza",
         "imagick_exception": "Kļūda: Imagick izņēmums, lasot attēlu",
         "img_invalid": "Nevar apstiprināt attēla failu",
         "img_tmp_missing": "Nevar apstiprināt attēla failu: pagaidu failu nav atrasts",
         "invalid_mime_type": "Nederīgs mime tips",
-        "is_alias": "%s jau ir zināms alias",
+        "is_alias": "%s jau ir zināma kā aizstājadrese",
-        "is_alias_or_mailbox": "%s jau ir zināms alias, pastkastes vai alias addrese izvērsta no alias domēna.",
+        "is_alias_or_mailbox": "%s jau ir zināms kā aizstājvārds, pastkaste vai aizstājadrese, kas ir izvērsta no aizstājdomēna.",
-        "is_spam_alias": "%s ir jau zināms spam alias",
+        "is_spam_alias": "%s jau ir zināma kā pagaidu aizstājadrese (aizstājadrese mēstulēm)",
         "last_key": "Pēdējo atslēgu nevar izdzēst, tā vietā jāatspējo divpakāpju pārbaude.",
         "login_failed": "Ielogošanās neveiksmīga",
         "mailbox_invalid": "Pastkastes vārds ir nederīgs",
@@ -181,7 +195,7 @@
         "mailbox_quota_exceeds_domain_quota": "Pastkastes izmērs pārsniedz maksimāli pieļaujamo",
         "mailbox_quota_left_exceeded": "Nav pietiekami daudz vietas (atlikusī vieta: %d MiB)",
         "mailboxes_in_use": "Maks. pastkastēm jābūt lielākām vai vienādām ar %d",
-        "max_alias_exceeded": "Visas aliases izmantotas",
+        "max_alias_exceeded": "Pārsniegts pieļaujamo aizstājvārdu skaits",
         "max_mailbox_exceeded": "Maksimālais pastkastšu skaits sasniegts (%d of %d)",
         "max_quota_in_use": "Pastkastes kvotai jābūt lielākai vai vienādai %d MiB",
         "maxquota_empty": "Maksimālais pieļaujamais izmērs nevar būt 0.",
@@ -213,7 +227,7 @@
     },
     "edit": {
         "active": "Aktīvs",
-        "alias": "Rediģēt alias",
+        "alias": "Labot aizstājvārdu",
         "automap": "Mēģiniet automatizēt mapes (\"Nosūtītie vienumi\", \"Nosūtītie\" => \"Nosūtītie\" utt.)",
         "backup_mx_options": "Dublēt MX iespējas",
         "delete1": "Dzēst no avota, kad pabeigts",
@@ -224,8 +238,8 @@
         "domain_admin": "Labot domēna administratoru",
         "domain_quota": "Domēna kvota",
         "domains": "Domēni",
-        "dont_check_sender_acl": "Atspējot domēna sūtītāju pārbaudi %s + alias domēni",
+        "dont_check_sender_acl": "Atspējot sūtītāju pārbaudi domēnam %s (+ aizstājdomēni)",
-        "edit_alias_domain": "Rediģēt alias domēnu",
+        "edit_alias_domain": "Labot aizstājdomēnu",
         "encryption": "Šifrēšana",
         "exclude": "Neiekļaut objektus (regex)",
         "force_pw_update": "Piespiedu paroles atjaunošana pie nākošās pieslēgšanās",
@@ -235,7 +249,7 @@
         "inactive": "Neaktīvs",
         "kind": "Veids",
         "mailbox": "Rediģēt pastkasti",
-        "max_aliases": "Maks. aliases",
+        "max_aliases": "Lielākais aizstājvārdu skaits",
         "max_mailboxes": "Maks. iespējamās pastkastes",
         "max_quota": "Maks. kvota uz pastkasti (MiB)",
         "maxage": "Maximum age of messages in days that will be polled from remote<br><small>(0 = ignore age)</small>",
@@ -267,7 +281,15 @@
         "unchanged_if_empty": "Ja neizmainīts atstājiet tukšu",
         "username": "Lietotājvārds",
         "validate_save": "Apstiprināt un saglabāt",
-        "last_modified": "Pēdējoreiz mainīts"
+        "last_modified": "Pēdējoreiz mainīts",
+        "domain_footer_skip_replies": "Neņemt vērā kājeni atbildes e-pastos",
+        "bcc_dest_format": "BCC galamērķim jābūt vienai derīgai e-pasta adresei.<br>Ja ir nepieciešams nosūtīt kopiju uz vairākām adresēm, jāizveido aizstājvārds, un tas ir jāizmanto šeit.",
+        "extended_sender_acl_info": "Vajadzētu ievietot DKIM domēna atslēgu, ja tā ir pieejama.<br>\n  Jāatceras pievienot šo serveri attiecīgajam SPF TXT ierakstam.<br>\n  Kad vien šim serverim tiek pievienots domēns vai aizstājdomēns, kas pārklājas ar ārēju adresi, ārējā adrese tiek noņemta.<br>\n  Jāizmanto @domain.tld, lai ļautu nosūtīt kā *@domain.tld.",
+        "pushover_info": "Pašpiegādes paziņojumu iestatījumi tiks piemēroti visiem tīrajiem (ne surogātpasta) sūtījumiem, kas piegādāti <b>%s</b>, tostarp aizstājvārdiem (kopīgotiem, nekopīgotiem, ar birkām).",
+        "mailbox_relayhost_info": "Tiek piemērots tikai pastkastei un tiešajiem aizstājvārdiem, aizstāj domēna retranslācijas saimniekdatoru.",
+        "sender_acl_info": "Ja pastkastes lietotājam A ir ļauts sūtīt kā pastkastes lietotājam B, sūtītāja adrese SOGo netiek automātiski parādīta kā atlasāms lauks \"no\".<br>.\n  Pastkastes lietotājam B SOGo ir jāizveido pilnvarojums, lai pastkastes lietotājs A varētu izvēlēties tā adresi kā sūtītāja. Lai SOGo pilnvarotu pastkasti, pasta skatā jāizmanto izvēlne (trīs punkti) pa labi no pastkastes nosaukuma augšējā kreisajā pusē. Šī darbība neattiecas uz aizstājadresēm.",
+        "sogo_visible": "Aizstājvārds ir redzams SOGo",
+        "sogo_visible_info": "Šī iespēja ietekmē tikai tos objektus, kurus var parādīt SOGo (koplietojamās vai nekoplietojamās aizstājadreses, kas norāda uz vismaz vienu vietējo pastkasti). Ja paslēpts, netiks parādīts SOGo kā atlasāms sūtītājs."
     },
     "footer": {
         "cancel": "Atcelt",
@@ -282,11 +304,12 @@
     "header": {
         "administration": "Administrēšana",
         "debug": "Atkļūdošana",
-        "email": "E-Mail",
+        "email": "E-pasts",
-        "mailcow_config": "Configurācija",
+        "mailcow_config": "Konfigurācija",
         "quarantine": "Karantīna",
         "restart_sogo": "Restartēt SOGo",
-        "user_settings": "Lietotāja uzstādījumi"
+        "user_settings": "Lietotāja uzstādījumi",
+        "mailcow_system": "Sistēma"
     },
     "info": {
         "no_action": "No action applicable"
@@ -385,7 +408,10 @@
         "daily": "Ik dienu",
         "hourly": "Ik stundu",
         "last_mail_login": "Pēdējā pieteikšanās pastkastē",
-        "mailbox": "Pastkaste"
+        "mailbox": "Pastkaste",
+        "sieve_preset_2": "Vienmēr atzīmēt noteikta sūtītāja e-pastu kā izlasītu",
+        "open_logs": "Atvērt žurnālus",
+        "sieve_preset_8": "Pārvirzīt noteikta sūtītāja e-pastu, atzīmēt kā izlasītu un ievietot to apakšmapē"
     },
     "quarantine": {
         "action": "Darbības",
@@ -408,10 +434,14 @@
         "subj": "Priekšmets",
         "text_from_html_content": "Saturs (konvertēts html)",
         "text_plain_content": "Saturs (teksts/vienkāršs)",
-        "toggle_all": "Pārslēgt visu"
+        "toggle_all": "Pārslēgt visu",
+        "disabled_by_config": "Pašreizējā sistēmas konfigurācija atspējo karantīnu. Lūgums iestatīt \"saglabāšanu katrai pastkastītei\" un \"lielākais pieļaujamais lielums\" karantīnas vienumiem.",
+        "qhandler_success": "Pieprasījums veiksmīgi nosūtīts sistēmai. Tagad var aizvērt logu.",
+        "qinfo": "Karantīnas sistēma datubāzē saglabās noraidīto pastu (sūtītājam <em>netiks</em> radīts iespaids par piegādātu pastu), kā arī pastu, kas tiek piegādāts kā kopija pastkastes mēstuļu mapē.\n  <br>\"Apgūt kā surogātpastu un izdzēst\" apgūs ziņojumu kā surogātpastu ar Bajesa teorēmu un aprēķinās arī nestriktas jaucējvērtības, lai nākotnē noraidītu līdzīgus ziņojumus.\n  <br>Lūgums apzināties, ka vairāku ziņojumu apgūšana var būt laikietilpīga atkarībā no sistēmas.<br>Melnā saraksta vienumi karantīnā netiek iekļauti."
     },
     "queue": {
-        "queue_manager": "Queue Manager"
+        "queue_manager": "Queue Manager",
+        "info": "Pasta rinda satur visus e-pastus, kas gaida piegādi. Ja e-pasts ir iestrēdzis pasta rindā ilgu laiku, sistēma to automātiski izdzēš.<br>Attiecīgā pasta kļūdas ziņojums sniedz informāciju par to, kāpēc pastu neizdevās piegādāt."
     },
     "start": {
         "help": "Rādīt/Paslēp palīdzības paneli",
@@ -552,12 +582,13 @@
         "tls_enforce_in": "Piespiest TLS ienākošajiem",
         "tls_enforce_out": "Piespiest TLS izejošajiem",
         "tls_policy": "Šifrēšanas politika",
-        "tls_policy_warning": "<strong>Uzmanību:</strong> Ja jūs izlemjat aktivizēt e-pastu šifrēšanu, Jūs varat pazaudēt vēstules.<br>Vēstules kas neatbilst politikai atleks atpakaļ no sistēmas ar kļūdu.<br>Šī opcija attiecas uz Jūsu primāro e-pasta adresi, visām adresēm, kas atvasinātas no alias domēniem, kā arī aliasi <b>,kas saistīti tikai ar šo pastkasti</b> kā mērķis.",
+        "tls_policy_warning": "<strong>Brīdinājums:</strong> Ja tiek izlemts ieviest šifrēta pasta nosūtīšanu, var tikt pazaudēti e-pasti.<br>Ziņojumi, kas neatbilst nosacījumiem, pasta sistēma atmetīs ar kļūdu.<br>Šī iespēja attiecas uz galveno e-pasta adresi (pieteikšanās vārdu), visām adresēm, kas atvasinātas no aizsājdomēniem, kā arī aizstājadreses, <b>kas norāda tikai uz šo pastkasti</b>.",
         "user_settings": "Lietotāja iestatījumi",
         "username": "Lietotājvārds",
         "waiting": "Waiting",
         "week": "Nedēļa",
-        "weeks": "Nedēļas"
+        "weeks": "Nedēļas",
+        "open_logs": "Atvērt žurnālus"
     },
     "datatables": {
         "paginate": {
@@ -566,6 +597,17 @@
         }
     },
     "debug": {
-        "last_modified": "Pēdējoreiz mainīts"
+        "last_modified": "Pēdējoreiz mainīts",
+        "static_logs": "Nemainīgie žurnāli",
+        "no_update_available": "Sistēma izmanto jaunāko versiju",
+        "in_memory_logs": "Atmiņā esošie žurnāli",
+        "system_containers": "Sistēma un konteineri",
+        "current_time": "Sistēmas laiks",
+        "external_logs": "Ārējie žurnāli",
+        "logs": "Žurnāli"
+    },
+    "warning": {
+        "domain_added_sogo_failed": "Domēns pievienots, bet neizdevās pārsāknēt SOGO. Lūgums pārbaudīt servera žurnālus.",
+        "dovecot_restart_failed": "Dovecot neizdevās pārsāknēties. Lūgums pārbaudīt žurnālus."
     }
 }

data/web/lang/lang.nb-no.json

@@ -92,7 +92,73 @@
         "r_active": "Aktive begrensninger",
         "queue_unban": "fjern blokkering",
         "r_inactive": "Inaktive begrensninger",
-        "r_info": "Grå/deaktivere elementer i listen over aktive restriksjoner er ikke kjente som gyldige restriksjoner i mailcow og kan ikke flyttes. Ukjente begrensninger vil bli aktivert i den rekkefølgen de opptrer uansett.<br>Du kan legge til nye elementer i <code>inc/vars.local.inc.php</code> for å kunne slå dem av og på."
+        "r_info": "Grå/deaktivere elementer i listen over aktive restriksjoner er ikke kjente som gyldige restriksjoner i mailcow og kan ikke flyttes. Ukjente begrensninger vil bli aktivert i den rekkefølgen de opptrer uansett.<br>Du kan legge til nye elementer i <code>inc/vars.local.inc.php</code> for å kunne slå dem av og på.",
+        "relayhosts_hint": "Definer sender-avhengige transportmetoder for å kunne velge dem i domenekonfigurasjonsdialogen<br>\n  Transportmetoden er alltid \"smtp:\" og vil derfor forsøke TLS når tilbudt. Innpakket TLS (SMTPS) er ikke støttet. En brukers individuelle utgående TLS-policyinnstilling tas til etterretning.<br>\n  Gjelder for valgte domener inkludert alias-domener.",
+        "rspamd_global_filters_regex": "Navnene forklarer deres mening. Alt innhold må inneholde gyldige regulære utstrykk etter formatet \"/mønster/alternativer\" (f.eks. <code>/.+@domain\\.tld/i</code>).<br>\n  Selv om grove sjekkrutiner kjøres for hver linje regex, kan funksjonaliteten i Rspamd bli ødelagt dersom den ikke klarer å lese syntakset riktig.<br>\n  Rspamd vil forsøke å lese innholdet når det endres. Hvis du opplever problemer, <a href=\"\" data-toggle=\"modal\" data-container=\"rspamd-mailcow\" data-target=\"#RestartContainer\">start Rspamd på nytt</a> for å tvinge ny innlesing av mappingene.<br>Svartelistede elementer er ekskluderte fra karantene.",
+        "transport_test_rcpt_info": "&#8226; Bruk null@hosted.mailcow.de for å teste videresending til en ekstern destinasjon.",
+        "transports_hint": "&#8226; En transportmapping <b>overstyrer</b> en sender-avhengig transportmapping</b>.<br>\n&#8226; MX-baserte transportmappinger er foretrukket brukt.<br>\n&#8226; Utgående TLS-policyinnstillinger per-bruker blir ignorert og kan kun tvinges via TLS-policymappinger.<br>\n&#8226; Transporttjenesten for definerte transportmetoder er alltid \"smtp:\" og vil derfor forsøke TLS når tilbudt. Innpakket TLS (SMTPS) støttes ikke.<br>\n&#8226; Adresser som matcher \"/localhost$/\" vil alltid sendes via \"local:\", derfor vil en \"*\"-destinasjon ikke gjelde disse adressene.<br>\n&#8226; For å bestemme identifikasjon for et eksempelvis neste hopp \"[host]:25\", vil Postfix <b>alltid</b> sende en forespørsel for \"host\" før den søker etter \"[host]:25\". Denne oppførselen gjør det umulig å bruke både \"host\" og \"[host]:25\" samtidig.",
+        "regex_maps": "Regex-mappinger",
+        "relay_from": "\"Fra:\"-adresse",
+        "relay_rcpt": "\"Til:\"-adresse",
+        "relay_run": "Kjør test",
+        "relayhosts": "Sender-avhengige transportmetoder",
+        "remove": "Fjern",
+        "remove_row": "Fjern rad",
+        "reset_default": "Tilbakestill til standardinnstillinger",
+        "reset_limit": "Fjern hash",
+        "routing": "Ruting",
+        "rsetting_add_rule": "Legg til regel",
+        "rsetting_content": "Regelinnhold",
+        "rsetting_desc": "Kort beskrivelse",
+        "rsetting_no_selection": "Vennligst velg en regel",
+        "rsetting_none": "Ingen regler tilgjengelig",
+        "rsettings_insert_preset": "Legg inn eksempel-forvalg \"%s\"",
+        "rsettings_preset_1": "Deaktiver alt unntatt DKIM og mengdebegrensning for autentiserte brukere",
+        "rsettings_preset_2": "Postmastere vil ha spam",
+        "rsettings_preset_3": "Bare tillat spesifikke sendere for en postboks (f.eks. kun bruk som intern postboks)",
+        "rsettings_preset_4": "Deaktiver Rspamd for et domene",
+        "rspamd_com_settings": "Et navn for innstillingen vil bli autogenerert, vennligst se eksempelforvalgene under. For ytterligere detaljer se <a href=\"https://rspamd.com/doc/configuration/settings.html#settings-structure\" target=\"_blank\">Rspamd-dokumentasjonen</a>",
+        "rspamd_global_filters": "Globale filtreringsmappinger",
+        "rspamd_global_filters_agree": "Jeg skal være forsiktig!",
+        "rspamd_global_filters_info": "Globale filtermappinger inneholder forskjellige typer globale svarte- og hvitelister.",
+        "rspamd_settings_map": "Rspamd innstillingsmapping",
+        "sal_level": "Moo-nivå",
+        "save": "Lagre endringer",
+        "search_domain_da": "Søk domener",
+        "send": "Send",
+        "sender": "Avsender",
+        "service": "Tjeneste",
+        "service_id": "TjenesteID",
+        "source": "Kilde",
+        "spamfilter": "Spamfilter",
+        "subject": "Emne",
+        "success": "Suksess",
+        "sys_mails": "Systemeposter",
+        "text": "Tekst",
+        "time": "Tid",
+        "title": "Tittel",
+        "title_name": "\"mailcow UI\" nettstedstittel",
+        "to_top": "Tilbake til toppen",
+        "transport_dest_format": "Regex eller syntaks: example.org, .example.org, *, box@example.org (flere verdier kan separeres via komma)",
+        "transport_maps": "Transportmappinger",
+        "ui_footer": "Bunntekst (HTML tillatt)",
+        "ui_header_announcement": "Annonseringer",
+        "ui_header_announcement_active": "Gjør annonsering aktiv",
+        "ui_header_announcement_content": "Tekst (HTML tillatt)",
+        "ui_header_announcement_help": "Annonseringen er synlig for alle innloggede brukere og på innloggingsskjermen for grensesnittet.",
+        "ui_header_announcement_select": "Velg annonseringstype",
+        "ui_header_announcement_type": "Type",
+        "ui_header_announcement_type_danger": "Veldig viktig",
+        "ui_header_announcement_type_info": "Info",
+        "ui_header_announcement_type_warning": "Viktig",
+        "ui_texts": "Grensesnittmerkelapper og tekster",
+        "unban_pending": "fjerning av utestenging avventes",
+        "unchanged_if_empty": "Hvis uendret, la være tomt",
+        "upload": "Last opp",
+        "username": "Brukernavn",
+        "validate_license_now": "Validér GUID mot lisenstjener",
+        "verify": "Validér",
+        "yes": "&#10003;"
     },
     "acl": {
         "ratelimit": "Nivågrense",
@@ -204,5 +270,57 @@
         "select_domain": "Vennligst velg et domene først",
         "active": "Aktiv",
         "target_address_info": "<small>Komplett/e epostadresse/r (kommaseparert).</small>"
+    },
+    "danger": {
+        "dkim_domain_or_sel_exists": "En DKIM-nøkkel for \"%s\" eksisterer og vil ikke bli overskrevet",
+        "from_invalid": "Avsender kan ikke være tom",
+        "bcc_must_be_email": "BCC-destinasjon %s er ikke en gyldig epostadresse",
+        "domain_quota_m_in_use": "Domenekvote må være større enn eller lik %s MiB",
+        "access_denied": "Tilgang nektet eller ugyldige skjemadata",
+        "alias_domain_invalid": "Aliasdomene %s er ugyldig",
+        "alias_empty": "Aliasadresse kan ikke være tom",
+        "alias_goto_identical": "Alias og gå-til-adresse kan ikke være identiske",
+        "alias_invalid": "Aliasadresse %s er ugyldig",
+        "aliasd_targetd_identical": "Aliasdomene kan ikke være likt som måldomene: %s",
+        "aliases_in_use": "Max. aliaser må være større enn eller det samme som %d",
+        "app_name_empty": "App-navn kan ikke være tomt",
+        "app_passwd_id_invalid": "App-passord ID %s ugyldig",
+        "bcc_empty": "BCC-destinasjon kan ikke være tom",
+        "bcc_exists": "En BCC-mapping %s eksisterer for type %s",
+        "comment_too_long": "Kommentar for lang, maks 160 tegn tillatt",
+        "cors_invalid_method": "Ugyldig Allow-Method spesifisert",
+        "cors_invalid_origin": "Ugyldig Allow-Origin angitt",
+        "defquota_empty": "Standardkvote pr. postboks kan ikke være 0.",
+        "demo_mode_enabled": "Demomodus er aktivert",
+        "description_invalid": "Ressursbeskrivelse for %s er ugyldig",
+        "dkim_domain_or_sel_invalid": "DKIM-domene eller selector ugyldig: %s",
+        "domain_cannot_match_hostname": "Domenet kan ikke være det samme som vertsnavnet",
+        "domain_exists": "Domenet %s eksisterer allerede",
+        "domain_invalid": "Domenenavn er tomt eller ugyldig",
+        "domain_not_empty": "Kan ikke fjerne ikke-tomt domene %s",
+        "domain_not_found": "Domene %s ikke funnet",
+        "extended_sender_acl_denied": "manglende ACL for å angi ekstern avsenderadresse",
+        "extra_acl_invalid": "Ekstern avsenderadresse \"%s\" er ugyldig",
+        "extra_acl_invalid_domain": "Ekstern avsenderadresse \"%s\" bruker et ugyldig domene",
+        "fido2_verification_failed": "FIDO2-verifisering feilet: %s",
+        "file_open_error": "Fil kan ikke åpnes for skriving",
+        "filter_type": "Feil filtertype",
+        "global_filter_write_error": "Kunne ikke skrive filterfil: %s",
+        "global_map_invalid": "Global mapping-ID %s ugyldig",
+        "global_map_write_error": "Kunne ikke skrive global mapping-ID %s: %s",
+        "goto_empty": "En aliasadresse må inneholde minst en gyldig gå-til-adresse",
+        "goto_invalid": "Gå-til-adresse %s er ugyldig",
+        "ham_learn_error": "Ham-læringsfeil: %s",
+        "imagick_exception": "Feil: Imagick-avvik under lesing av bilde",
+        "img_invalid": "Kan ikke validere bildefil",
+        "img_tmp_missing": "Kan ikke validere bildefil: Midlertidig fil ikke funnet",
+        "invalid_bcc_map_type": "Ugyldig BCC-mappingtype",
+        "invalid_destination": "Målformat \"%s\" er ugyldig",
+        "invalid_filter_type": "Ugyldig filtertype",
+        "invalid_host": "Ugyldig vert angitt: %s",
+        "invalid_mime_type": "Ugyldig mime-type",
+        "invalid_nexthop": "\"Next hop\"-format er ugyldig",
+        "img_dimensions_exceeded": "Bildet overskriver maksimal bildestørrelse",
+        "img_size_exceeded": "Bildet overskrider maksimal filstørrelse"
     }
 }

data/web/lang/lang.zh-cn.json

@@ -356,7 +356,7 @@
         "description_invalid": "%s 的资源描述无效",
         "dkim_domain_or_sel_exists": "\"%s\"的 DKIM 密钥已存在，因此不会被覆盖",
         "dkim_domain_or_sel_invalid": "DKIM 域名或选择器无效: %s",
-        "domain_cannot_match_hostname": "域名与主机名称不匹配",
+        "domain_cannot_match_hostname": "域名不应与主机名相同",
         "domain_exists": "域名 %s 已存在",
         "domain_invalid": "域名地址为空或无效",
         "domain_not_empty": "不能删除非空域名 %s",

docker-compose.yml

@@ -175,7 +175,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.122.1
+      image: mailcow/sogo:1.123
       environment:
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}

helper-scripts/docker-compose.override.yml.d/BUILD_FLAGS/docker-compose.override.yml

@@ -16,8 +16,6 @@ services:
     build:
       context: ./data/Dockerfiles/sogo
       dockerfile: Dockerfile
-      args:
-        - SOGO_DEBIAN_REPOSITORY=http://packages.inverse.ca/SOGo/nightly/5/debian/
 
   dovecot-mailcow:
     build: ./data/Dockerfiles/dovecot