From 0ea61b60a902513578959aa3b08f030551d675c8 Mon Sep 17 00:00:00 2001
From: mhoellein <mario@hoellein.online>
Date: Fri, 15 Mar 2024 06:26:20 +0100
Subject: [PATCH] daily autocommit

---
 .etckeeper                            |  8 +++++
 amavis/conf.d/20-debian_defaults      |  5 ++-
 letsencrypt/csr/8037_csr-certbot.pem  | 26 ++++++++++++++
 letsencrypt/csr/8038_csr-certbot.pem  | 16 +++++++++
 letsencrypt/csr/8039_csr-certbot.pem  | 17 +++++++++
 letsencrypt/csr/8040_csr-certbot.pem  | 16 +++++++++
 letsencrypt/keys/8037_key-certbot.pem | 52 +++++++++++++++++++++++++++
 letsencrypt/keys/8038_key-certbot.pem | 28 +++++++++++++++
 letsencrypt/keys/8039_key-certbot.pem | 28 +++++++++++++++
 letsencrypt/keys/8040_key-certbot.pem | 28 +++++++++++++++
 myssl/dh2048.pem                      | 12 +++----
 postfix/master.cf                     |  4 ++-
 12 files changed, 232 insertions(+), 8 deletions(-)
 create mode 100644 letsencrypt/csr/8037_csr-certbot.pem
 create mode 100644 letsencrypt/csr/8038_csr-certbot.pem
 create mode 100644 letsencrypt/csr/8039_csr-certbot.pem
 create mode 100644 letsencrypt/csr/8040_csr-certbot.pem
 create mode 100644 letsencrypt/keys/8037_key-certbot.pem
 create mode 100644 letsencrypt/keys/8038_key-certbot.pem
 create mode 100644 letsencrypt/keys/8039_key-certbot.pem
 create mode 100644 letsencrypt/keys/8040_key-certbot.pem

diff --git a/.etckeeper b/.etckeeper
index b3241a09a..ea501ce25 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -10723,6 +10723,10 @@ maybe chmod 0644 'letsencrypt/csr/8033_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8034_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8035_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8036_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8037_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8038_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8039_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8040_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'
@@ -18761,6 +18765,10 @@ maybe chmod 0600 'letsencrypt/keys/8033_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8034_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8035_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8036_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8037_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8038_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8039_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8040_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
diff --git a/amavis/conf.d/20-debian_defaults b/amavis/conf.d/20-debian_defaults
index 6c9e761b3..b1f82b031 100644
--- a/amavis/conf.d/20-debian_defaults
+++ b/amavis/conf.d/20-debian_defaults
@@ -33,10 +33,13 @@ $enable_global_cache = 1;    # enable use of libdb-based cache if $enable_db=1
 $inet_socket_port = 10024;   # default listening socket
 
 $sa_spam_subject_tag = '***SPAM*** ';
-$sa_tag_level_deflt  = -9999;  # add spam info headers if at, or above that level
+$sa_tag_level_deflt  = -999.0;  # add spam info headers if at, or above that level
 $sa_tag2_level_deflt = 5; # add 'spam detected' headers at that level
 $sa_kill_level_deflt = 20; # triggers spam evasive actions
 $sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
+#ändert nichts, keine X-SPAM Felder in Mails
+#$sa_spam_report_header = 1;
+#$allowed_added_header_fields{lc('X-Spam-Report')} = 1;
 
 $sa_mail_body_size_limit = 200*1024; # don't waste time on SA if mail is larger
 $sa_local_tests_only = 0;    # only tests which do not require internet access?
diff --git a/letsencrypt/csr/8037_csr-certbot.pem b/letsencrypt/csr/8037_csr-certbot.pem
new file mode 100644
index 000000000..72d9170eb
--- /dev/null
+++ b/letsencrypt/csr/8037_csr-certbot.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEfDCCAmQCAQAwADCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOYr
+ncHIueorEpt7xEQmeONp6rCOgExv7Sxm+9dnujvcmfVhNzuWvgx5kJGjVtGHoGvW
+Rd+rKhixamyXsVa9tNc7ZAFbpr8dL8ws0+tc9u0olgycY8MBsykoaA8Aorpj6OaQ
+lWIhJJBvrDPr1SHrgYZvN+zRNQYy7+JGlgJmou/adGMTGLcc/A45xcPPBRjb+NkJ
++boclGBZIINc4k2SRdfHRtbWNZALgN1kFoUY6ZO50BSGPZepLTu+gqdl6Z4DG/17
+M/JLJ6LPiJs/cKqf2zH/Pdvrk07laxqMEjoAaUQafh2cYpQzS7TY9v8GUWOAo+qC
+iIKwdUKMdPZHuLBZ+rmoKfy6o/JRg7GnpAAI0QEti2sU507jU0hxLoze21BJTCY1
+P+cDAEgsX8xZ2TNNlWetpn39tiwuo2jLiHZpL37XX7miF6dgpBQ+XXM2tlg/X0jg
+UD3vdackoFtD3OEOSF7Xd/eGzZakH4Nm9LotpzTmdMuCRosZTpY8MXSZQOmS/98h
+ho6QX3bzAOzLZYa6DxFcR8tuSBvoqyS2dUG0zD3OrPmMAR7Zm7BWXQxnrkl7vYbh
+InktLOJvK75Zu0CJlG+Wl2UWEzD1BPblSJHdUBt07oHt1VzSGGcJHS5KRdwAL8Vc
+drZsBGArpptasqmecUjIIo1ejRvNNREzcBk23jBdAgMBAAGgNzA1BgkqhkiG9w0B
+CQ4xKDAmMCQGA1UdEQQdMBuCGWNvbGxhYm9yYS5ob2VsbGVpbi5vbmxpbmUwDQYJ
+KoZIhvcNAQELBQADggIBAJ1Xp8YUO6VcyUMx0CXdj0bpNX5al9J8OYEP3UqW/4Q2
+QmKEgFgdc3eAm8mduBORqpSX0AiUFRsbnLhRpbBh0WITRmnn7TCc6aoZCRbVBLap
+KMaj3bkDPsdJaydF1LNOa1DgTHAJeNp3rjiVAdvzynHF+fxw3OIEA1C/eF9fL5L1
+HpmkgUgWrM0X1OPUJkf624HEEgf7gajwj7mCFNKwsCCAYepljdkeQsumgDtbKLS5
+STd0kegDyyKdBZD1HCu0r7wB0IP4Dipwke22RaQchxa87s5cYhOB/MBy4lpfq2pu
+F8CuxQWBlOzxCy8UIl7BDLzUjcUwo1Q8XMU3kgkhWuV8cMxJc5MKu4UGJR3ou+z5
+UhPK5WaXKrIfhslMeVH6KJ5fQ0iLlOl4VqyxGoXfmNuqkyZa9S62txyMl0P+cHht
+Zhgq0KQz+447gBujkNQiSQu7rlJlOR5Nad3DW1/LRBriOqli/JcReczTJ+6qNzuS
+rhC0j5gS6I/8UOULHK8Pc1tf18er87sESzmwERaWIUOKqpd7XtXvQQToPlYHoihN
+uMDeM0yWlIUTWcxCTRvI3hiJtUlSuVmHJe/3P6yyAdhCMFBORnN7sfMqMMqUo2cQ
+oQvK+k8F8K2IgOpoCiCERIJiNfPhUVqs/WlgxDtBWpZY2Y3mIdtKcnOUejwXAN7l
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8038_csr-certbot.pem b/letsencrypt/csr/8038_csr-certbot.pem
new file mode 100644
index 000000000..0774c681f
--- /dev/null
+++ b/letsencrypt/csr/8038_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIChzCCAW8CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJQ
+e8el6BRj+1qgDkHcSH3RQzxjsFPapzDSEW+4bCJ76H7EBdlKRiTq8vwlMBMVW3rO
+Xj0/2ILWF/ONelWkRAeNJ5F6RwlbEoHyWRp88HzfkQP3/TYImshkhkqnTgkuPsMs
+zS1zzeHqhgq6eVaaVw3nqYSMwVxFWrSvu4eiRDKdZZwHLHp9Aqg+QHoU8ZhlLLXm
+kV8MQjqsU5Qlzy8loURgp3sCaRTX1JYUxZobHqMvWE91Rr5fi5V1FwH4JPRXylIb
+DRik/rBjbi+QY2PaVggjge6dO7RX8V6SanE844TPIdjbvULb3RvkAIPnib7HBKm6
+YzdbeeVAi9R98CKJvBUCAwEAAaBCMEAGCSqGSIb3DQEJDjEzMDEwLwYDVR0RBCgw
+JoIPaG9lbGxlaW4ub25saW5lghN3d3cuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3
+DQEBCwUAA4IBAQDJ65KhDFeWNXxiGL1fMp/lwXM132zlRhWmTwvnk3Kyl58YaPWP
+4MTndcuxHz0bk/n0LK4TvDqarynaQ+hkc6jdBqW2UeL7g/y+F4fiucsMZvEdPGbn
+3ZnsckLzmjo9zfgS9f/QeEE6M4vjHSuD134uKDq1fWlLuszYLDEK6HRUJzkQKNAb
+hNUXVEyvNcuVp0Z8rN3eezM3pxWabO9ETdWuI8oUM24JlS5uffgTV8V9L2OG0wcX
+rkvZtxXYDR79dw+Qhy8eCd2BDD/s3LaO21yZmc8RRRAGZfcdCe85trL/PoNfOMhF
+2QS30AwaY2wifLKyGqDlomat/u9/9I6EoxFt
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8039_csr-certbot.pem b/letsencrypt/csr/8039_csr-certbot.pem
new file mode 100644
index 000000000..c6cb37987
--- /dev/null
+++ b/letsencrypt/csr/8039_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+v
+kbNhdyIE12XdVyazF3SfCi6ZMXR5t9gwkI6kdIJ1imQbkRni45WFvvhrwHYaXVFj
+KgQBiOtGYy1isdhQnyy0C2urDnzHF3fcpz/5DH0PdjmAePr0ebeDnaMorGX+KKqA
+c7jktpy+iKBCtSl1wYuLf8+40NMGIgy7I/TAJyCzBtvddGPtNek8UEGP6qeuk3BJ
+LvH00YMgn2R2aNQU736/lUnSPj1cCamQf7mR2Zqmr4PQfcRDn5Tn/Kd3HUf4wwOa
+nuCR857Hk9uoBDTlX4RGD1JjOmmugzgQjZNY+OElDzQYVXgXXkq+8MdnlbXD5t4J
+yI1ru/TJRBBewB3+KHcCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAVxKNiX4YVLGE
+5FFlmV8gNWy6rjYoA7kZasEGGVVOGnbviHc479PcwL1J6Pk8LkU3UUji+sTq+Uj1
+ROHJU6wlw8+Tq68w7A7A4CukuLgAiPYecp/b9AvFWxBNRK/yO+S2Fiqxz4G5WohG
+zKNv1ZnPv3+okKq1H+f8kysX8zTB0hyFDznXfQbc9yTcjjPfiNCzTW24BVxqcMI+
+JpLhfP0wc2iMwvargEld0uh4rM/mgQ98aZanjGR76DuMmbT5nzBXyoaiO3ZXrW9T
+Z+wloq8Vx8wa7I3ADq8m2xPg5EZ5futV6PwGRf1xYAhhAX7I0UtZlR9qbpicZcnV
+bzisKHIsvw==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8040_csr-certbot.pem b/letsencrypt/csr/8040_csr-certbot.pem
new file mode 100644
index 000000000..328573a92
--- /dev/null
+++ b/letsencrypt/csr/8040_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdjCCAV4CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyV
+qprnomI8nFLqmN9eThLaCazEVg41gxh1mD9GQjWdC6ef7B9Lebm35NUCZOZHnzhz
+DyLg92Z8QbbfLJfuYeaj/+q+Gbo7GQ9fjxua/dZuJ6h3qJ71w6RGWegtCjdlbkxJ
+tqV3qEg8ONYZ7o1EBdIy+WKXPrjEaTVvPTH/2vIXWrDKR1Sh1GgpMjeceH0PsxQ4
+XK4vOpHEzwonlZ/0Mhhjc/sGjyHnkyxzZvVyTciWNZsYEO0bw996d2XtFsYqaItj
+xrO0mAfTK57/hw9w+1m+aVATmVYQ59Kp9N9ZlDpP4S/zOKVCoWze3djWQ4v3YjEX
+OsqhyIhroJFH65Rk/7ECAwEAAaAxMC8GCSqGSIb3DQEJDjEiMCAwHgYDVR0RBBcw
+FYITd3d3LmhvZWxsZWluLm9ubGluZTANBgkqhkiG9w0BAQsFAAOCAQEAsVS25Fm/
+UezQ5LYuZGrun7PTDm6DPTFK8A4HQqnHJgbpYMDD4D+L0axhEVyX+uNV6AvKxx4X
+PwdPs3HLmCj9aPuC7Hll91oN7zjzmklM7+JO0CI69QNp1zdFlggmXllk50irFwZN
+ICmwnZfUEcuqdAJ/0SiN33BsqCLzqq2BU/7zWP8XAXLunkAyR/8vJJud8AsB4elX
+oY1/XfAMI7DviLSQFgfTbS6OLlq38KBlc7P/yJblFhaPXzXi3emu23VeeHJU8o6d
+IW4dAHoU4JWhUmbhwLZUdiB5Qybiq1kGLTtXL1sWRpN5OZ8FUhPGpAfz/K+m9EQA
+hY06KkyZ8gAE5A==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/8037_key-certbot.pem b/letsencrypt/keys/8037_key-certbot.pem
new file mode 100644
index 000000000..8dcd43123
--- /dev/null
+++ b/letsencrypt/keys/8037_key-certbot.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+CM65VXjvfr76EYGTvuZUEXZCELT8oVw=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8038_key-certbot.pem b/letsencrypt/keys/8038_key-certbot.pem
new file mode 100644
index 000000000..3cfef4934
--- /dev/null
+++ b/letsencrypt/keys/8038_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSUHvHpegUY/ta
+oA5B3Eh90UM8Y7BT2qcw0hFvuGwie+h+xAXZSkYk6vL8JTATFVt6zl49P9iC1hfz
+jXpVpEQHjSeRekcJWxKB8lkafPB835ED9/02CJrIZIZKp04JLj7DLM0tc83h6oYK
+unlWmlcN56mEjMFcRVq0r7uHokQynWWcByx6fQKoPkB6FPGYZSy15pFfDEI6rFOU
+Jc8vJaFEYKd7AmkU19SWFMWaGx6jL1hPdUa+X4uVdRcB+CT0V8pSGw0YpP6wY24v
+kGNj2lYII4HunTu0V/FekmpxPOOEzyHY271C290b5ACD54m+xwSpumM3W3nlQIvU
+ffAiibwVAgMBAAECggEBAJ8ryoKPTdYg1VsBR8kQrsyKVBigWhMcqOyKECg9q5lt
+rchDEyogzHWkW8H5YykOQO3wweIZMAPVhMsPiEbIy7PrYMb5hEnQY3F1uXoSlO/t
+RBN83GbInFyNuBVICgdouJd+kMqVmnwgwtHbz3l71ebwLZvj63OqCbw2Q/ejF3o1
+xZ8Yc0UYb+cc8poaE9vO23Vi79fcCYg0JchXXiEHjLd7Gr7xUB1Z9KQV4MVmS1rU
++e3a98V8VUdMRFg/f7l8g+FdM+V9lCNROfZmL4gC/t65BL2f4NS2wyDYeURfYXg/
+RzqW20uZvAY1t06v97gnmBy6RA+vBe0fpg6rL4nD6AECgYEA9e9omWTIjtZw3iJK
+K70+vPYUbwYiMph4jqqN0Cd5BL9ONgJSTs707pkX1YTZgfbjWXZjQ1mvTa50Wu/+
+fMbSh4/6GX3CrB+rJsaICY8CWqVCfO3HJBBW/o3FKPiApRRHDw4ookv0Sk3QrsEW
+T2HZpV+RNb4FEoh1dMGOvqobMC0CgYEA2uvi20XfHu3QOW3btmISqYiqTaV84dyu
+aW5l6z/3BzgRByNnBgwxbBv76/p2tRxwjdztJzshEvER2fDsUf/0l9PLnl4t/9Cc
+DOdhV5xtlSR9aM8ZUiqnTtqRqbRlgQr0F3KttQwaEs4mKRvNOyWaDAauIN7QLmbW
+4fu5B5OVRIkCgYEA7KiiFiIWoOUYHZoPl8F3UuzWQvQ7CkcQk/DpoGmrmfbhszVO
+sQmURtnJRq2dhOPoaRl0ccYm3HDJBQ027imBQ/Q3bjpHj8y1rQ2UsOYOFN48ee1y
+GXEj1bblCAUB/ljh/Enarjq67Jmu+8tQxbjacLnjCT0+slPf+yebTjxxB00CgYEA
+y2bdaTPbIaZ9j85FlIg8pK3o5am7hTMADc9X/KJ6x4dNMt+uygysIrFBeLhGcPHS
+lcxNv+SNT0cSefcB6xIwVJyhFCyW+pb9VnPomnkpy6eSqb253gDpYDdtnUqSALqH
+nf2b7Zon448MH6fIIItIPKI8SSgcLvC3+FFkUejKiFkCgYB88/uxHy5uM8nrZSg1
+7V1yDbapmddBFt+mGGAiBX1t8ewJfJrtD1NMIBMlwG/+JXsJ5pE5eXuwaRW7RDGp
+LYtMHAO4SszMiuu+jcPafkrMzGFmoGtmr/igJbWBDERKf/Rme+D8v5YvYf0xlH3+
+aiYSuFW4gsNbYcrJCgl3AkhOxg==
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8039_key-certbot.pem b/letsencrypt/keys/8039_key-certbot.pem
new file mode 100644
index 000000000..3e47b5f20
--- /dev/null
+++ b/letsencrypt/keys/8039_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPr5GzYXciBNdl
+3Vcmsxd0nwoumTF0ebfYMJCOpHSCdYpkG5EZ4uOVhb74a8B2Gl1RYyoEAYjrRmMt
+YrHYUJ8stAtrqw58xxd33Kc/+Qx9D3Y5gHj69Hm3g52jKKxl/iiqgHO45Lacvoig
+QrUpdcGLi3/PuNDTBiIMuyP0wCcgswbb3XRj7TXpPFBBj+qnrpNwSS7x9NGDIJ9k
+dmjUFO9+v5VJ0j49XAmpkH+5kdmapq+D0H3EQ5+U5/yndx1H+MMDmp7gkfOex5Pb
+qAQ05V+ERg9SYzpproM4EI2TWPjhJQ80GFV4F15KvvDHZ5W1w+beCciNa7v0yUQQ
+XsAd/ih3AgMBAAECggEBAIis2Oy80oLPvtTpkeYE7AWyeCfsZvBo/cTHSQqmTYph
+Qf7ZaWcoum73ApNHjfPrK8hYwxi5zdpPiwseLT3W6Lmpju5/NtyExPv7eRGPm1ld
+6Ia09mjopIVRl1b9eF7yoN58BCwET+zdMtqMq94qAYIM/sK7tKl7GsNYELSME/Pe
+zLJk5tdCLFhYvNKOVawQTsQnmoaUGC/tNnYF5WpgTstPfxRZMr/J3s39iAuPnH54
+Wnj+aV6hCAOh0NVeCoqHwK+CX5lVelP9XBCnzVY7kGJzJ645SFnatWxsFP8fVopO
+bR36FfxkwyafqL4pU9OWHTgu7Sr8S/cuK115uzmt3QkCgYEA+rS5vbGImxAEyZL3
+h6kivczHnwvAXrC5xLGy573iADwTj/cSVECWSqEPShuGOGQ8maamd1y/2AXpJnBF
+Uz7X0ekaLCFInVKzSWZdY9ZBD2g9u2anebOOjAD3tasccZQ+hhFSAeVGbanZcxuu
+U8xNQefwGoBG3k7Wo5Zn3+tScjsCgYEA1BJIrgAIF/zFaWA1LSY+guwXYvQDdnXY
+JXZ2AuYAvEyHhqIK88sQOT/uHHYePmOP5WKZVa5a0EYu92msGbNziRjSVI9hDt7P
+p/+cifTTuTZoUaIjGfis5RlHdCy1Xn6kSPf+u8P+qktYut/qarbfviH+akvK2Har
+VIUFny0RIvUCgYAvsvTn74AzKHAQvgKUcAypGe4dB4pZObyOfNSyHMGEE+oQ6Qw2
+tXciydPz4Jq/3epdvYRMj3v8qNs8Mf4uoXVEfdo57Tc4n4R3AZ/hH+GPAeFE53oT
+wKLtZj269cxam77tmRwGOk4VDUzPBsQ7M1K7qFpZYHCbWVqjEzm+M7KjAwKBgBDl
+B/88p2hpzbxQWswnANHjRxWuBNyaFMcfQdWHR0W4/w79t8umQLue2TRRQKWNvvfy
+O+70fe2bucAiHgDKKAki/haYeY36uCZVGb5vz7IwoGzocs1t3zA9LFEYArbtdd8O
+Sq/gtFgSupXgoscvnHGEOcV0FkvaYFnSYxlEONpFAoGBAJmxC3O3NOa++wxJuAn8
+Z+MMj2Oqrmze506x3D48SGg00HooqfKhbVh8e3lws9f6kDyXKRnOjXaBLYu6z61B
+uBVFXhkqvMcuuRfj0iiGodfqjqkRPxLJhwevVS1DQE7VKXEA8MS8L7dPjmQPDGBA
+QsuKuK35tJOMxkqPNcKhSn5j
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8040_key-certbot.pem b/letsencrypt/keys/8040_key-certbot.pem
new file mode 100644
index 000000000..0deebde94
--- /dev/null
+++ b/letsencrypt/keys/8040_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMlaqa56JiPJxS
+6pjfXk4S2gmsxFYONYMYdZg/RkI1nQunn+wfS3m5t+TVAmTmR584cw8i4PdmfEG2
+3yyX7mHmo//qvhm6OxkPX48bmv3Wbieod6ie9cOkRlnoLQo3ZW5MSbald6hIPDjW
+Ge6NRAXSMvlilz64xGk1bz0x/9ryF1qwykdUodRoKTI3nHh9D7MUOFyuLzqRxM8K
+J5Wf9DIYY3P7Bo8h55Msc2b1ck3IljWbGBDtG8Pfendl7RbGKmiLY8aztJgH0yue
+/4cPcPtZvmlQE5lWEOfSqfTfWZQ6T+Ev8zilQqFs3t3Y1kOL92IxFzrKociIa6CR
+R+uUZP+xAgMBAAECggEAZ5R7LTSLrYscZoqqXaUkiDzmWxeIrmb/ebnIHHkY+oYJ
+qZO5e9q9xX7Kl+I/bavjfDQc/L7D45qTtt/ldwLVhG2SG6ql4fkb5gGutf5R+GgL
+Iit7LwglRp3r1TZAju2G248Sr1IW3IPJDvVQJyvCerseMoF62xduYQRyCkeM9bZf
+jkncCEx3Y6TouKNOEFIzq3AwM+HE5R/h7Yib0nbKUjugqBQbwqGEye71lLtqXJ7K
+kKJgULaU4v2lPrj/NRNAboKzerypGJ/eAsweoRwDOk4nLRYxfqBUrdoehO8wgZY2
+wHXRkJP3MgKjpTImaqyWu9/hYH28PbjQc/0uQHEppQKBgQDnnpBmjfcTzUo2YZ36
+CA0/ol+Y+Iu7HJbOhumURnE9k2G80uimXtX0g/eNjINc5Vc2IHD3orhk5GvayfhO
+oHjgu6/yuDRcDmTpuepmNMmh1H6JvFjiMSqEAtPfD3g3/7xW+bz7tQjvoeFXEaOw
+cyZyVcTHk3RfqvNWM/8g6jud8wKBgQDiHpkgzcLdbaZMAjfAT0eoKnVjE0teQoHx
+kKO0f1Ww/tS+exK3M4BKumKX3wPy6qDfT5glomGpTB/6G4qixiLu5ZEEUqbCAmNt
+kNipGpPP4rOVRQH6DWCixFeTQwB+4zIKICROvfy6830vkOwbPeNPwPo5YQwW6P0D
+xXNsoFZAywKBgGKlXcrP29NLM7hFiwraMwpPFXgJIznlyzTasNC9z6zyAEZzbTKu
+YWFqcxyOI8SEyMf8uSA+5VnTDzx3mJGkNtdAGIe/fE1YtBH3ZKVzBg0ue1YeKZzs
+Y7clnSb7Z7Ax8vz4EE0DpXKp91cl5BlacZ1wegal/oJgRJMKQja6i/mRAoGBAIsN
+YgGIR2NAANoRKxO6LUi/A30v6lNG9v4EgoeHHr0/mLiimrnKlARgZi0a2iTSIKfz
+HI9YMlKYG7oEodbDncvnpKxR33bDXT2Nq48iZu+aa/FJhJOvElRGBczrkSx2rtkH
+NwytTPPytHNB3dBK2LS86aPLiFG2aZGeJQMR/rjNAoGBAL92Zr3+ufkQf1831DgN
+EJeCZSKC4qAd76c/5Ita7gqcJWUEnGUz1DlXwxCMCOwVcfG2FiBhF3tYJduOWxoC
+381M3sf/0BCtLc1qCz2aY0OhtPvYI8fo2/xTegu/xAotnzkGMHEx+HQLNqJoHEUy
+1hxVCuS7JroNuXaCxevh0OIg
+-----END PRIVATE KEY-----
diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index d0ea4e648..4ff4410af 100644
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA9l+WDsNdFBjUsfNHU6OY1n5Ry9ZDAfAVp9HNTTXJApAuC9iAqIYq
-pG2Gcgjb9dJJif7+Gg0pHV5eP83HJwmPjvfvB7mJesG7qRYilgPrekbAvVfWcpJR
-HGGYN5ArsHEkzHhKDlxF+T+Zb/QNZLvFUDgbuXFFSJ2reSDGPPH+dUbWr9rJ32Qx
-bKjIxvA8p2LWep/JZSFfbtAC3dubbRfz/4M2BdAslynkdAld1jfn7GMxx8SNCmUL
-5Z8TqRno0UQicDz3AwCXHhvoiD7JR5z1zkyZgJ5IRvzY5uG8DdVjzGrlA2M3MS2f
-Qp+LEFsEk9EmnVL0J0ieyYsEK+a/NbbMQwIBAg==
+MIIBCAKCAQEArbksZhhK1gBcXo8N2JoJ5fqTPvFFuGVN0XNtBoq0EV0DHD0HS/pQ
+wViGE4BLYoS6oFHEA5LhnTi4hZAdrknwsIR6qdJxCQpM5i7JJVvORW++013nbZgK
+owLMQt5l2oISuCrE7Zo5mgXgDk1ip/ZuNq5MMDzuVrkH9uy5mGiOVPYbwk4Ds23I
+cN7GucwO38WKhEnK4s/cg5j56sBeAZXgVdG2D+DqaL9TbYsngqspMDMsRVekLpA4
+yFZAIyS4JONrCz9F8AD/MyAacZ2oqGUrYaAdzKL94+6jiq8KYbnxEl0Qn8SR6g8p
+193Dd/WISS7zMTS1swnTBVzMBl6GTvBdkwIBAg==
 -----END DH PARAMETERS-----
diff --git a/postfix/master.cf b/postfix/master.cf
index 7ea682887..6a863a5bc 100644
--- a/postfix/master.cf
+++ b/postfix/master.cf
@@ -17,7 +17,9 @@ smtp-amavis     unix    -       -       -       -       2       smtp
 	-o smtp_tls_security_level=none
 
 smtp      inet  n       -       n       -       -       smtpd
-  -o smtpd_milters=smtp:[127.0.0.1]:10024
+      -o content_filter=smtp-amavis:127.0.0.1:10024
+#
+#-o smtpd_milters=smtp:[127.0.0.1]:10024
 ###
 ### SMTP-Daemon hinter Postscreen: Schleift E-Mails zur Filterung durch Amavis
 ###
-- 
2.43.0