daily autocommit

diff --git a/.etckeeper b/.etckeeper
index eb221562913b6568d668ae997e979c8e81587a6b..ce7990c5f5faac564b8cebfb378fecbeaf916939 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -284,6 +284,7 @@ maybe chmod 0644 'apache2/sites-available/hoellein.online.conf'
 maybe chmod 0644 'apache2/sites-available/http_hoellein.online.conf'
 maybe chmod 0644 'apache2/sites-available/http_nextcloud.conf'
 maybe chmod 0644 'apache2/sites-available/http_siedlerverein.conf'
+maybe chmod 0644 'apache2/sites-available/https_siederverein.conf'
 maybe chmod 0644 'apache2/sites-available/mail.hoellein.online.conf'
 maybe chmod 0644 'apache2/sites-available/nextcloud.conf'
 maybe chmod 0644 'apache2/sites-available/nextcloud_siedlerverein.conf'
@@ -1711,6 +1712,9 @@ maybe chmod 0644 'letsencrypt/csr/0500_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0501_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0502_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0503_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0504_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0505_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0506_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -2216,6 +2220,9 @@ maybe chmod 0600 'letsencrypt/keys/0500_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0501_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0502_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0503_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0504_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0505_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0506_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/collabora.hoellein.online/README'

diff --git a/apache2/sites-available/https_siederverein.conf b/apache2/sites-available/https_siederverein.conf
new file mode 100644 (file)
index 0000000..cd41eed
--- /dev/null
+++ b/apache2/sites-available/https_siederverein.conf
@@ -0,0 +1,4 @@
+<VirtualHost *:443>
+    ServerAlias www.siedlerverein-wittgensdorf.de
+    Redirect 301 / https://siedlerverein-wittgensdorf.de
+</VirtualHost>

diff --git a/apache2/sites-available/siedlerverein.conf b/apache2/sites-available/siedlerverein.conf
index d2c678c50bf8b88e0e0ed69c1d10e935256c3be8..17656b4c5e2c82272a4dbe4e3a8cff58c8317229 100644 (file)
--- a/apache2/sites-available/siedlerverein.conf
+++ b/apache2/sites-available/siedlerverein.conf
@@ -1,13 +1,10 @@
-<IfModule mod_headers.c>
-        #Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains; preload"
-</IfModule>
 <IfModule mod_ssl.c>
         <VirtualHost *:443>
                 Header set Referrer-Policy "no-referrer"
                 ServerAdmin admin@siedlerverein-wittgensdorf.de
                 DocumentRoot /var/www/wordpress_siedlerverein/
                 ServerName siedlerverein-wittgensdorf.de
-                ServerAlias www.siedlerverein-wittgensdorf.de siedlerverein-wittgensdorf.de
+                ServerAlias www.siedlerverein-wittgensdorf.de
                Alias /.well-known/acme-challenge/ /var/www/html/.well-known/acme-challenge/
                <Directory "/var/www/html/.well-known/acme-challenge/">
                        Options None
@@ -19,13 +16,6 @@
                         Options FollowSymLinks
                         AllowOverride all
                 </Directory>
-                <Directory /var/www/nextcloud/>
-                        SetEnv HOME /var/www/wordpress_siedlerverein
-                        SetEnv HTTP_HOME /var/www/wordpress_siedlerverein
-                        Options Indexes FollowSymLinks MultiViews
-                        AllowOverride All
-                        Require all granted
-                </Directory>
                 <LocationMatch "/(data|conf|bin|inc)/">
                         Require all denied
                         Satisfy All

diff --git a/apache2/sites-enabled/collabora.conf b/apache2/sites-enabled/collabora.conf
deleted file mode 120000 (symlink)
index 60eba08..0000000
--- a/apache2/sites-enabled/collabora.conf
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/collabora.conf
\ No newline at end of file

diff --git a/letsencrypt/csr/0504_csr-certbot.pem b/letsencrypt/csr/0504_csr-certbot.pem
new file mode 100644 (file)
index 0000000..0be74d1
--- /dev/null
+++ b/letsencrypt/csr/0504_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOSS
+T16RhsweCXfjWVKzb9j6Zr1cD+RO2RmVNg1J3f0Z0ZyVj7Y7tQS3vn1dclakZfNe
+q5nhZXnujzukmulgiB4XqVeG2nX0sFcW1uypGusPb4fL3NbKHrPxa/egpTeTXmBM
+aCFtveOKnTpu01rTJjWo2TC3HpVlXlz4EosP8je04IvtHtJF0aoH9Zu0JZr9a7YG
+J3oRBd0AVcNLGlOnwpjBrmFh/2jOaTPO/WbY14ohdi3NIS6VlogPO8G9IvTcglTY
+8V6mn2EViVjUioOzhVAvjYQpRoe1NeZjSUVFQu7zVcOPJ5GEhVjiDOxH5W9OpYL3
+tRFp4REoxNXAVYBlWd8CAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAzScd3LQ6qxri
+lkEsc7+giY5BfyTV5mZmkH//F+8OmoVA7NK4r2gTVZEDP8chodkdAFa/ru5Ql3+v
+BCcQ0vdMzxHJMaIiDQPxJ4IXh84IFt4jUR+MtS0WxejIILiCZEMiBx83Hcb8lvVz
+EWKdViRoCvSolXH705Ksx0xsAoyrE6AVJHCARHlfCPHN90M1etK62iyhOeogC5F2
+Ic7CmmxZDhNFEZqloZL+dPbYKPCN7BF07H9VXnV70ZErOapSccc6S22bZQIVSY6N
+r3SzF2HmfKmAYsMMlBh8U9Wb2uTyR2lUWs+FrWKyAW976asAY0uSSqBOH2GJtD+T
+P0JMBpgpAg==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/0505_csr-certbot.pem b/letsencrypt/csr/0505_csr-certbot.pem
new file mode 100644 (file)
index 0000000..f10f08b
--- /dev/null
+++ b/letsencrypt/csr/0505_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2h
+MLzXsJtBOWdzgy8yz8xo+xueLtfIXT+rJxaDwdd0AIcp8a/wBmFuZMlTslmIkOBd
+0ttn0Yo7KDIiWX1ozkxMkMCzGb+o1K8I32yAoh6t2vCve1PljbgjyrxqRvLz8FBx
+8I8Om5FuHd+wsne1PcIifIywCBQjTAtTXV6akJaeAabZNxl0x/DJASaZLr+JNCbE
+nfMpnykRGyOJp3dyESYk9l3taEq8eG2iQkDq6HjiYi9kr2xFig7BTuckjWJsfOxK
+PNR0LdqBeDeltngF+06/x/ZhFcLnSCxMQ16fQbue3EtFBkOMrgmWq8elo1rix5Bt
+m49T64zNHLBlWr1+qPUCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAFWpl4aTl00Jw
+QnjHZwxJRN5mGru8LBGfeREj49PtlBdj230AFOFjTGUIpVQ9A6XLqWxS1JCndZQp
+W8JFM3/995d3OIkcG4cPm+ynXOfoK6xjCORfAlvU+C3wvSlpVn2cLALIjT1B0NHf
+IIw6JjwGxAkUshbAjNpDBDGrm0OHSFpg7Fl95rwSX8SM34YE3duDKLOjvr1URF/i
+5m8uhJeyyFgTXcyUreQk7DX0W10X/NvBQylSwPi4A+AGdiPniMAyBD4AOzHcw3tP
++ppXXpp4xnHXWIqJzpaCtwO93jMH2i4Chlm+ml3asE69azJOyEg6KUMjlfIxY1hl
+RtLaUrKU7g==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/0506_csr-certbot.pem b/letsencrypt/csr/0506_csr-certbot.pem
new file mode 100644 (file)
index 0000000..47619f5
--- /dev/null
+++ b/letsencrypt/csr/0506_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhR
+Rgy4670QxQBmGobgDI788yDf9lrAUgNGC3OF2wvccv8sdvaQvrci3krne43pY2aM
+H+am4Y2bXCyp+Ief0wuF+vXrg7rjgNA5DpQ++HBsNDVIJAN4TgR5W+CP7OP12iJo
+elCZp1g0K1eYjE7jaMncKHK2PdYc75ZcwdwGTs88Z5uCjkNRmx2noBNWvVvX95Mz
+OhcyigjyloZdkzQXVw3tXe2JGCselTge/ADxBPUV/PfuvsM1nRz5pp/cIk+uLC4O
+T/ANCwd9yyEzIscjoov7hmDw6tyz0OABAztj98o0ziKauEzEYWlsXKWmZNwk3gpy
+Yjs8g0WNOqpApba1d1sCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAgCljxzyKNNDy
+JYL1E7ZVjfGjoo5Y6uEFOd5drf7BLKmwnmx1ccljlENKzi1pAWs4n4WfPPGpgDyk
+BKGgRniEtSZ2JZWBxIHE3UPr9sk1QK9tTfqzUxO06Dc/dhmymvSHLG0wNAw+ORhZ
+Y1/MGdovYNoa1TBtKFcQUwaBGXTfDj5+v6nmG07ArcqIC3PR6HXwQKfyEJXbPa81
+0LGpgswDMEW2tPcamzvzWsMi8UfWapWO+SCS69pMf0tQLTH/M5UBVAL3npj3Ecsz
+pv/+SR/h4nU4Z4mBMMdssF/z3Pap8DNlzL4pqPo1eKtqLS3215k+mIo+GgyjXLPP
+FfpZ9W/Ojw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/0504_key-certbot.pem b/letsencrypt/keys/0504_key-certbot.pem
new file mode 100644 (file)
index 0000000..a208aa9
--- /dev/null
+++ b/letsencrypt/keys/0504_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkkk9ekYbMHgl3
+41lSs2/Y+ma9XA/kTtkZlTYNSd39GdGclY+2O7UEt759XXJWpGXzXquZ4WV57o87
+pJrpYIgeF6lXhtp19LBXFtbsqRrrD2+Hy9zWyh6z8Wv3oKU3k15gTGghbb3jip06
+btNa0yY1qNkwtx6VZV5c+BKLD/I3tOCL7R7SRdGqB/WbtCWa/Wu2Bid6EQXdAFXD
+SxpTp8KYwa5hYf9ozmkzzv1m2NeKIXYtzSEulZaIDzvBvSL03IJU2PFepp9hFYlY
+1IqDs4VQL42EKUaHtTXmY0lFRULu81XDjyeRhIVY4gzsR+VvTqWC97URaeERKMTV
+wFWAZVnfAgMBAAECggEBALA31JUWIRRw+9/AGXdW+54OvvKybVYZK+s7TCbGkiy1
+oRLVg6x9L7vpZSUFzEbcC/WrQSUrzq5Iq4jSCNRwJcD9gQMH5pkWAnXCGATxAt3C
+UrwhAatevHkCYbjR006bgSFBBu7uyn0Iutr34l6dd1HbUUbrhtqrAisu3iz0KEuk
+5JPWIRlzSWmrD/v4gWeudqD91EQ0fUAbwwtOECQiL6mzg7OZtoJZjIPW2XyP570N
+pxNWgi7krF8yvYAQS9G4BNKFbN8R0uISoPPAfPhK4mv3Ygyq13ctAoNRHdcZG7wk
+zmV+T4ml6jsozvDHtexHy+7g1X278OxMKB5VqS1ES/ECgYEA8mkPwVeB0QuEXUP3
+7HkGHmYicrg4tvtYLpdx3HmST0SbxWvnl09X65CIB2Li3PPosiM8RksS9LJ4iOLb
+36g3Ytzhv/88HddU2hMneYNU7UN4nPvZ17eyQhlgePOSO/HnSwYQVp1/odpoxNM5
+TqkKyDziC6wbcRTEpY4bV3URIeUCgYEA8WKkBpFKS8N9B8jaFE6Vg13KSP+dQ3p2
+nXkpKqC6I7YPpmMQTJ4MRKP6yBLZksuy4fhmFZrJ53D38gSTw2VFHcs6/51/9Wn8
+qLbEgFVHKXMQGm8NqAP2il8OLXQ/2M3iKwN5GIP05hUuuDdC53TlNQu7jb0iqwBo
+mVq6D+o0oHMCgYA/bIOlx3p8snG4YT8tzOBv9bMPpumX3p1M22z8DYbdXIsRFVFr
+wmOzi4Y7wICw5NQ+P3/WuG/GPCfTUN/MXdvX7wjVzjbxa9SUlixe26DNzzhwgmiV
+y0dFihQ2sSvSqVElzPlbYCvzsgx1avp0fUAH8f4GpcosRQ3KbyryL/wCjQKBgHJl
+cBzYsGA1lkShMJEdKQhn450y3wICwMIikJruLykLeGE/Y5Mb9+5z1D8Lh+dk+DLV
+ePPWNsejpy4gczLQBLB5B03rA6B4CVCfxYKYZ7BCIqiUZuFwd1/eaqaqCDQkZoJC
+FBrFNsPv2ANf1SpCIPpBxDIJJ6vo9qlu8Ozn7ub3AoGBAIBgij3jIRtONpgtsv9T
+MH1eELQ7maexpyAFa6Pd24DNYt5qpgMY+r/TmTa2SaB7prfpLPnstoygeKU4QCQH
+tp6gVPfWZhm+9yI1VzQh9CzgNTmKNHyhqaFsaNtaJzldbWIDa6pVAGKLWKwFWWs6
+RqsKUYHS+JkRVcOh8YpX0d47
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/0505_key-certbot.pem b/letsencrypt/keys/0505_key-certbot.pem
new file mode 100644 (file)
index 0000000..a51f29f
--- /dev/null
+++ b/letsencrypt/keys/0505_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9oTC817CbQTln
+c4MvMs/MaPsbni7XyF0/qycWg8HXdACHKfGv8AZhbmTJU7JZiJDgXdLbZ9GKOygy
+Ill9aM5MTJDAsxm/qNSvCN9sgKIerdrwr3tT5Y24I8q8akby8/BQcfCPDpuRbh3f
+sLJ3tT3CInyMsAgUI0wLU11empCWngGm2TcZdMfwyQEmmS6/iTQmxJ3zKZ8pERsj
+iad3chEmJPZd7WhKvHhtokJA6uh44mIvZK9sRYoOwU7nJI1ibHzsSjzUdC3agXg3
+pbZ4BftOv8f2YRXC50gsTENen0G7ntxLRQZDjK4JlqvHpaNa4seQbZuPU+uMzRyw
+ZVq9fqj1AgMBAAECggEAYqE/P0mUUvw2xkb/eYIdML19thytUpClZ6M2vnAjV1O/
+no3DZnYaa3zGsSx2PDla2UgTjwjNpO8l9gWFtEPZ4TeFpqTBBL3keXHM+5tgN0LH
++J3dMILaFmePYDaK1nzohn7s1wuLALZclWdLPBYpnBrh2y8H1KmTOOTQUI9mGuAI
+zDsDNyyE0GaTWU5jTr/s4a8pICPF/5ydYcya6lCu/cskLAPRidQjrvLMUBDqpzAD
+1xJNe112dRygw0uFBMCqpQ0toEnzbFQ2UrkA5COD18fSeEK4dEjbZUaqW2udxet9
+1RJqcMqLugtQ+dCbJGDM1/9hFyLY3U7xUedjDwsWQQKBgQDhVuKk49PZ5acyTrmh
+BR0MeVxrSE7ch8Rxc2QqnVjrWwRrTWA5Scf/YkeXxBl4rhx/Le4aU9NRY2kd+wXd
+yK+GBjEissUZUrGbLvUsYyGZriuscA7apOGFVPEPWLWyKNiKxC3HaKZ+wmHQDOBE
+ubWBLIaqoatw5vUu0ZGM82MY8QKBgQDXbnLPFfHzLloZSQJA7YzVqVYP7jTrS32q
+upfc00gwboxG9/K7eDRKZdscYXTtn+ZYeNYwxt0EhY9ggABAlTJkD8YBEvWn2TAK
+pNL4ET02So1Bn4/Br1W9U+eliBJcvYVN+JzwK1GEOLYjfvpauXNCw6uh6OO99eVl
+0wvK6tfwRQKBgQCMyW4dO0K3VuaZZdpQohM+Iez+ElVDL4gqob+paFmP4nPmXpeJ
+83EDPHIifiCz54RiaV3kEQ9sQEICuz01DhesEt5MIYlHgwT4QeRocR8jF1CuEe0V
+6gIE/ccGoZQT1bVFLcC0X8v2UpguFn1gMu8V363bmdq1VXdGYyUe/Umi4QKBgGO5
+60fV/tT2BhtiYrqvvNxDsWVafgDWR2w7SIWfAPH6mtFXgnQqJvqxwAaZTsmZlcYq
+2exmgnXPZhnj5zn+Vv9fFef1YOa8cbLbrhXL1SxGwrE4LhIZGnW0W62TGfz4drcr
+eWrsgqXUouw3oalR4/tqHQ+sgZC0PecvFWxv3lqJAoGBANgK4JwSbUE+5URLAad8
+zdw0bU61npC558yIZVZ/1/yDVbR0V4j8eD6Eo94tFQr15aQ0czikvCLn8ohVyq9B
+wuWZk7jNr5g+Qbo0sHoI01PhvPz1NIeLPr6IYKWRTfwx4OO367Ca8zqXxt966vl4
+dH9xKmm8BT0vPDyYpKjqklNn
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/0506_key-certbot.pem b/letsencrypt/keys/0506_key-certbot.pem
new file mode 100644 (file)
index 0000000..74509bc
--- /dev/null
+++ b/letsencrypt/keys/0506_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYUUYMuOu9EMUA
+ZhqG4AyO/PMg3/ZawFIDRgtzhdsL3HL/LHb2kL63It5K53uN6WNmjB/mpuGNm1ws
+qfiHn9MLhfr164O644DQOQ6UPvhwbDQ1SCQDeE4EeVvgj+zj9doiaHpQmadYNCtX
+mIxO42jJ3Chytj3WHO+WXMHcBk7PPGebgo5DUZsdp6ATVr1b1/eTMzoXMooI8paG
+XZM0F1cN7V3tiRgrHpU4HvwA8QT1Ffz37r7DNZ0c+aaf3CJPriwuDk/wDQsHfcsh
+MyLHI6KL+4Zg8Orcs9DgAQM7Y/fKNM4imrhMxGFpbFylpmTcJN4KcmI7PINFjTqq
+QKW2tXdbAgMBAAECggEBAI72eZEnX9wtCTq+mtdNI3xx3qFUlJ3JNTDtZYIgeOBB
+IY5v5Zi3csnhaFNVwZoJHMr7alXK/Jk04ObrAeIKGMQQFOUNEK8xKY5Gf3CVSgn7
+BWWdOHApUtDQN3Qmomm0L/FrrqJIFdGr5aJqBAdnWstcYHqKoq98qUOv/CTPptjK
+no1aAg4XcZlPvPW0ImNS732n2XZQ89GZbXz2P6UD71H6dfHJJE0QwDeRhAFmmaY+
+3Fh6KBJuYPNf12ewQTI+vbY/Lm96Lk6p5bAy5Gs5EdZxZ1K8nlZm3kQysSESr8kO
+6VB2kzC0Jjvm4G7patFuwCmlusnUFENI2iR/3QlXUEECgYEAyez3DRngXFh9m71g
+xYtR8pYMYqZyLrd4ZaDC9/SjaFeH12eVfJFpPoLKlTi4xbuDBxOAdeHnB1DHkz9L
+8AMJYRFj0rlFfiuDaDcMHbivuKlJJnsNPuu7f3a0VEDhgmotWTpWb93x5J6/Fl4V
+WtpSmV1v9iMrIMvpoT3hH8PNr80CgYEAwRtqPvjtIneEJt9lK7B448q/MzULbS/L
+f+CxsYqd1PwS/Tus/5+/NIODoZnc+XyG3ShKdSz9zI86/KwkjWHaOyBoaeirIEhz
+OgVAZ3LyC3K/b23hVimdgUaaVkROpiK9Xe/TM0K+SEDIqF+yfiA2aTKx5et1TxE0
+8JDJ7OxUC8cCgYAknZ++9G5G0JUWZKTjrXvSrXrZeK1D42klpJ02MVpgVV8ApHvq
+9sNK3pS1sm9vC62a3uJwfeJS5UcLYHL4ttRAkdK0J3x+gI13nGPKD+9tYOUu4Slp
+u31og7H3hTxfVbmbcIS0DF8MweyMtcrRir1nqhXfYEk1zUQ0RPBJvkvSEQKBgGAu
+SXLoBSR/psC9z+Q811mN6EGXEAPoJFGjFp45TneAveyHRpljdZawUmWw/xD8ZyfM
+I5nNOPQj+ttS2jnZHRsJ/zeQ/Xrs2wdxCiz8YXY2Rwc3EV8bByoWglSpXQr+jpc1
+FlqXybKvIcJLN9n+LVukNlswNZOWHGodk5V/+DSNAoGANnArM0C59KxQzqY8ahBk
+PtTg1DQAu4gPT02+LDS6qzmscqKfJiGE0XCj414CgGUKUkIkPL1sOy+4HTKhQjOG
+AN1bMixLhjfeFpW2yMaOsldTvbTHiIa3hrhOQe066qC0NK4nPEjBpwHZ8UgFoNCQ
+Yu/yTTvaczxkjpgBEnLoi/c=
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 65a7e2c0144b24a01151dfe62c6aa5ac7f037fe1..8c8a757c385f6675c0292f5a16095d9bef56bff6 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA8PlmlREi6zL9j8kiJPVjLVYbZEd8ePRZCj1zjhPF+IYVBvzCUdO9
-SGaWwmW5Ke7ZXkjFBN2zzY+ApLHr9cUL7D6AIob5okM9a0dMvyj8yAM5cBRcBpAG
-/sQPlucLawnOw9Cj9UhxEZQWnnFUwFH+RakRfO8r+zbX9VZnLxHLwM4C5OjvVNsR
-mqxK8YphbVCoOtQg/L25UpogpBlQ1/MshLDkdeXaLHl+3pPdm0395wivMOx18lDz
-XmWadjaInPXe3KuMqmOl3tzMMCEhHCmgq4bM3cp6EnHjLWKviInfjZsUeUEGTyL2
-fUeoI/5Uv5CQvTB06XpqyOt63lqxJLvDqwIBAg==
+MIIBCAKCAQEAg6NF0Kqj2Wx0DvFNbg+s5Q6chhdcVMlTBhEhKYEnalwOptLqQC4z
+zH6QqGk+4WkkiUfDNqSCjI5lDi6y/jCQCl+HDKfx0Pnqua+50PhiN3FL9Hnirkp1
+jwDPDRvPEYcwRqglPCBn/9fsWZ/7fqekIz5nAe4uUfPzoNTpeJqEmEX6Ks93/0aw
+UBvNsg67AGxoRoTqQCvqi0RBbonS+BUNOoTdAdTU4a0B5+s6bxO1NoyI6U+pTE6C
+iCK6VSqAjgfQEmGYpYWPRyb5IzYuiF9CPHNrE+nG+XyCDn7Td2rzcF3RBHJgacPJ
+BD6ccbSXjq115Wn6Fpevvizrz9Xbfjoz2wIBAg==
 -----END DH PARAMETERS-----

diff --git a/postfix/main.cf b/postfix/main.cf
index d2af21961036b35732e124273317f95e91e3581a..e00e11aec834bf8085f1e60d846715799053fefd 100644 (file)
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -88,7 +88,7 @@ smtpd_relay_restrictions =      reject_non_fqdn_recipient
 
 ### Bedingungen, damit Postfix ankommende E-Mails als Empfängerserver entgegennimmt (zusätzlich zu relay-Bedingungen)
 ### check_recipient_access prüft, ob ein account sendonly ist
-smtpd_recipient_restrictions = check_recipient_access mysql:/etc/postfix/sql/recipient-access.cf, check_policy_service unix:private/policyd-spf
+smtpd_recipient_restrictions = check_recipient_access mysql:/etc/postfix/sql/recipient-access.cf
 
 
 ### Bedingungen, die SMTP-Clients erfüllen müssen (sendende Server)