From: mhoellein <mario@hoellein.online>
Date: Tue, 19 Mar 2024 13:39:51 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=efc2c36f8e1f48622b254c83042d908d0362e88a;p=vserver

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index eb7294e71..c1b8c62c9 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1644,7 +1644,6 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
-maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
@@ -10791,6 +10790,10 @@ maybe chmod 0644 'letsencrypt/csr/8074_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8075_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8076_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8077_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8078_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8079_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8080_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8081_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'
@@ -18870,6 +18873,10 @@ maybe chmod 0600 'letsencrypt/keys/8074_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8075_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8076_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8077_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8078_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8079_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8080_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8081_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
@@ -19389,9 +19396,12 @@ maybe chmod 0644 'skel/.bash_logout'
 maybe chmod 0644 'skel/.bashrc'
 maybe chmod 0644 'skel/.profile'
 maybe chmod 0755 'spamassassin'
+maybe chmod 0644 'spamassassin/64_myRules.cf'
 maybe chmod 0644 'spamassassin/65_debian.cf'
 maybe chmod 0644 'spamassassin/init.pre'
 maybe chmod 0640 'spamassassin/local.cf'
+maybe chmod 0755 'spamassassin/plugins'
+maybe chmod 0644 'spamassassin/plugins/FromNotReplyTo.pm'
 maybe chmod 0644 'spamassassin/sa-compile.pre'
 maybe chmod 0755 'spamassassin/sa-update-hooks.d'
 maybe chmod 0755 'spamassassin/sa-update-hooks.d/amavisd-new'
diff --git a/amavis/conf.d/05-domain_id b/amavis/conf.d/05-domain_id
index e1174c004..ae4d1039d 100644
--- a/amavis/conf.d/05-domain_id
+++ b/amavis/conf.d/05-domain_id
@@ -14,6 +14,7 @@ chomp($mydomain = `head -n 1 /etc/mailname`);
 # override or redefine this if $mydomain is changed later in the config
 # sequence.
 
-@local_domains_acl = ( ".$mydomain" );
+#@local_domains_acl = ( ".$mydomain" );
+@local_domains_acl = ( "hoellein.online" );
 
 1;  # ensure a defined return
diff --git a/amavis/conf.d/20-debian_defaults b/amavis/conf.d/20-debian_defaults
index b1f82b031..3e2d039df 100644
--- a/amavis/conf.d/20-debian_defaults
+++ b/amavis/conf.d/20-debian_defaults
@@ -38,8 +38,8 @@ $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_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/amavis/conf.d/21-ubuntu_defaults b/amavis/conf.d/21-ubuntu_defaults
index f2a7e7694..29c69bd88 100644
--- a/amavis/conf.d/21-ubuntu_defaults
+++ b/amavis/conf.d/21-ubuntu_defaults
@@ -10,8 +10,8 @@ $enable_dkim_verification = 1;
 $final_virus_destiny      = D_DISCARD; # (defaults to D_BOUNCE)
 #$final_virus_destiny      = D_PASS; # (defaults to D_BOUNCE)
 $final_banned_destiny     = D_DISCARD;  # (defaults to D_BOUNCE)
-#$final_spam_destiny       = D_DISCARD;  # (defaults to D_REJECT)
-$final_spam_destiny       = D_PASS;  # (defaults to D_REJECT)
+$final_spam_destiny       = D_DISCARD;  # (defaults to D_REJECT)
+#$final_spam_destiny       = D_PASS;  # (defaults to D_REJECT)
 $final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
 
 $virus_admin = "postmaster\@$mydomain";
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
deleted file mode 100644
index e69de29bb..000000000
diff --git a/letsencrypt/csr/8078_csr-certbot.pem b/letsencrypt/csr/8078_csr-certbot.pem
new file mode 100644
index 000000000..0bf3ffee6
--- /dev/null
+++ b/letsencrypt/csr/8078_csr-certbot.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEfDCCAmQCAQAwADCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOZa
+t6I+QaADw3kd0w1z0W25yB5YAo+AZAyMD3cXJTjchJpC0eFL9iXDR7BNfOyAbphN
+zRiFT/KQQsYlqCpPyCuXWfK+fGjERx7khzx/kd2f/BMLjD9a7Vm/LszcQCuPakqB
+0WxODQCoNg82v8jXPdeNjuGAvOGrzi/3VlPUrgEFNioxuGfR1hQNM+WEHi4GEjov
+m8is9L9+2I77vNb6XaT+W0KPWeE1ckhevLCJj9bRQO0S6WN+iXM3J2pLxKAgc5fX
+2QCXg6t6inOb7b3kVdZVRYUh2Ts5vgyaoacsUZ/47dbDBejgCoxs2uByDJeznJ64
+Ngyem0jV9JnHIeqWz0InsjL6BrC03z/BlymOxDNyzgagL58P9H72Q0WMGPrv9jNS
+2OtM6sYVVcC8C6ji8ttbZgnVIYAIkrPUfBfHyxWPDIeEQMq9/EgSYCg39Bn3RQHO
+obdjHkHhgg+7O3oAMphVgjokTUQ/wuR3xK987+l5jSq0ybn9ptgXmf5oTWhxl575
+LSgi90M5D//2oTZaUpiBTakAnfUoAETgbNOCHiZDcins1+KPMU2yx9DhGhWOBN79
+oW5RLJlV7r/YsY+Nvux3rza7lTYguUxrso9o/R6ArQpHkupYEU7wm7hnxf8y9Ka3
+NUc2BwVsmVE4Qgp3m4ad0+16p6QLHhz9g+CHd6M1AgMBAAGgNzA1BgkqhkiG9w0B
+CQ4xKDAmMCQGA1UdEQQdMBuCGWNvbGxhYm9yYS5ob2VsbGVpbi5vbmxpbmUwDQYJ
+KoZIhvcNAQELBQADggIBADVZ2dpenOzL4jRoktTHI/19XMhCi/0WfwJ09dTXMsyM
+lXg3CbtmGvwlvVKVgn8rBf2sESnFac90HgL/N0NJAKSVlXXFiIAb7730KANYF8Av
+zGYPa3gBu5oaLhFBqyeYz2dSRCVkUFy/+mMn0jkt0p/cYLt8DUFbPZGR9L4l7Ee8
+Z3sLyxbRTa8FTTzViMaGEk1neFU0lxCH1vcrVnRNoJuoHrld0uxjY4eTYbC6ubi7
+qKTOWjGBt2eKLhG3jHZ0bEQiNglzrCt4AcoqQsfzATCkbEsty1FKk5h0PlsTsZ8T
+3S661LvIrB19QoLmU8RFye6NtTGiIKsK7ChnN4015B4Cutg74HECsx5L+z26P33u
+/RJeYGlBsFGU6wGHjxyrWQ0lVcckj/a1O5UBp7myhUFeaC9zsEqcfpIUNPzE7r+b
+N5JCLr14TEU9cAdzUYsgDJyqibCGkO5TF/bMbUGCel8h430wtlyIc86y4Ft3gVnB
+RyuhPErlheWjGdxX/RorEkDNDXmhCMKPxQ9Di7BG4bRcwoTl4ZUULrgwgqMahqEG
+Uf8Zt+15bREhHOw0Fntqus1GVaXEhQG8aVJWD6DZ5ApmIYDX9HANe5xBrcP7GZSe
+uqo/vGSZ/Oq0VACkBWcmso97EcvEsRAAJ4tV6QoORCEYPX3M/BYP5/UFvEiVWkPo
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8079_csr-certbot.pem b/letsencrypt/csr/8079_csr-certbot.pem
new file mode 100644
index 000000000..31f3e12f9
--- /dev/null
+++ b/letsencrypt/csr/8079_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIChzCCAW8CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxF
+ZvlxGS+H9BA72Nkn1FWP2dlsACQ6UFbMVJ9CTzOLRoBt93Wa9VvNnQScB1Ir2JIJ
+koRLTvImS8gcjVTOTyn9P5AUGmfY8jrEbnq9G7JeyV8ZrxN3ewTF9MnnZWrmaeVD
+MjTNz8d+wzYyIf3xlLi/VnV6WecHwgT/Vw2uvWtwVgXROwXp+d/oLioJGmBJKXYL
+VbZ5f+xHkhTU7Uc6dgVh7ZZpgZ3+UnTEpMdmMc5KaGqschx7VJdIbP/bIMFURdMj
+Sk1lpaFe3Kwes6VsMMfMdYfrZRyZawR2G5l11InL77eQeLX3gOz+QKDQYVXTikdA
+ZvZt7m1Z8lOSmb+kANECAwEAAaBCMEAGCSqGSIb3DQEJDjEzMDEwLwYDVR0RBCgw
+JoIPaG9lbGxlaW4ub25saW5lghN3d3cuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3
+DQEBCwUAA4IBAQCB2+hAlSlXCv6V7iLmjBOMbTircqlzNI0SrqN8GGLpO2UrjzhH
+HLwXHnpg1xvj3Mh6fSy31CbKJAhPnsyfDHeTIYLcV6zu88/6V+iJxWz8uHHgBggN
+Ezj07gwCJP5AUw+HmibZnawfNQpP35m/IemkRKfsFc1aouy0YF5hJ0XGcDSWp/j9
+TEDWoK8clu1o9faexTFnixHx/mEyQ+y4ry+Z6enm1+TDlMIOyICJFDfEybDxtWZD
+X+Knv49OKvuZHxeS2dLPr2BYWmX5+BSs0LG/e1efm5LcpeeEE2T9h619iEMk7AqW
+aUnNDINMUfoomlEiQFU8+9iNOlXKr2sfnRLe
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8080_csr-certbot.pem b/letsencrypt/csr/8080_csr-certbot.pem
new file mode 100644
index 000000000..96778a7e1
--- /dev/null
+++ b/letsencrypt/csr/8080_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHT
+nESH3916fxWw8iCbj8J6xm37Zpzd2xoU7Amfm7hpTdFPYG5kTJUdRT68FhtW6vuX
+p8Swg44l0Oz/V7ThGNDp0tN5hEnc20KpXfN3pjIO3yWXw8NzoudrCWVPDb5+T8xn
+rbf8ZNUpyBkiGc5YQRqe1ZdWuD+dPtfzaL4IuNObwYYKFDbwibTIeYc1a+2F48xE
+UTL96/cXn0W9FRSajUVJy0garQy7jUn26WgICzoQeJJErXn+2d8qLbF05f/cC/Hq
+j4JiP8yyWHeLkTuUdNnY9KzI4YRRW4Zd3wHqzBzWfMMh5oim+St3M3AjheLhZgXl
+yDCW1fcIyKODJNm5/VECAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAdsgmQVOjY2WS
+hCW0kwQeHjINWO2SPpqqgT2iEpccgXdBbO+SlJuh9UuXJEn9YbIaZyV4kZrI2GzS
+Hi+8YggQVOV6f2CeYEmtRtB9VmFORfDK2eyEz3YciaNpQQse2MtJE9pYDQfgU3pR
+Y5m7905Vtz2F8dMNFOILOmqc8wNQUTTqqrKNnGnl6P7OcmOsdqVVG6aiZQF/BfXK
+/8bg4DG57cuUarQJgzUy27oSIwhuCbtttS/zP8z59iM066bgZBhoaILdtmvfgh17
+i27fVRGLSSuyzo3lEoWvWDr6f9lMuxutGOqw0GK8Fnrsz7diiaLLnk3lx/pSVkTf
+EebZCZWClg==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/csr/8081_csr-certbot.pem b/letsencrypt/csr/8081_csr-certbot.pem
new file mode 100644
index 000000000..02cc73f89
--- /dev/null
+++ b/letsencrypt/csr/8081_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdjCCAV4CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALbH
+ZpS9zWZOdFIQ4RkanXVcgTIO27eDQ+mcpb+5rv8JLLSwShDKP3qKqmc18jtUWCKm
+TDBVEFWxMIcF3sKjz6nCngRszgT+qI/f8zNK2l+wCSaIjR8tnw6XrZ7gJtGNIX1h
+Woo5l2MV2/9j0rNxAd5HAAr48SaF9p1L5SdSrulrAsqBrHiYYR+3I85LE4x82TvH
+QgCXIGU2ZqojVB/f1AJNVCha9ZeO45Lz2gvLX5CBY8dRDnSrycWYLuj2sUkoqjMW
+Rqxm1FTP/QIuU3UEKtIiv+F0KaIQ7boTlAwL8Q0VxB6AN78J5fbB8c+oaFpyoKSn
+Fj11DyE+9kpaYfNRCRMCAwEAAaAxMC8GCSqGSIb3DQEJDjEiMCAwHgYDVR0RBBcw
+FYITd3d3LmhvZWxsZWluLm9ubGluZTANBgkqhkiG9w0BAQsFAAOCAQEAMumdxNEH
+C9UWmcji56TTGiw/EWjS1KixaOqXyZgfHzLU2/AlXEgin2fJIs+0lUefzu7fz51x
+Y9/gOhSdHIgPInX9DSlf+fKBKCrJzfdEavwtdOnFa3ZrjTM2sAVOlFk0yM9yCZZn
+ZUuaCWJ3TltHEP55gSAhwYFRWgvv48cVXlP7pKSNft+Y9v8uhOdeCbP+RtkndHnf
+L0mCAvM76Ie2TVvA1K4gtvxuC2cX4hIK6edkhxJStDLJXMNNTNyB3HmrHsBpSGM7
+7jzqTuQtkvfmEIt6X3nzwpVmHUatMdCN6W6uPJu/TQ/VppBDeD8FzaYBT2sawZU3
+x/qgCsC1x7yOaA==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/8078_key-certbot.pem b/letsencrypt/keys/8078_key-certbot.pem
new file mode 100644
index 000000000..90fafa8bd
--- /dev/null
+++ b/letsencrypt/keys/8078_key-certbot.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDmWreiPkGgA8N5
+HdMNc9FtucgeWAKPgGQMjA93FyU43ISaQtHhS/Ylw0ewTXzsgG6YTc0YhU/ykELG
+JagqT8grl1nyvnxoxEce5Ic8f5Hdn/wTC4w/Wu1Zvy7M3EArj2pKgdFsTg0AqDYP
+Nr/I1z3XjY7hgLzhq84v91ZT1K4BBTYqMbhn0dYUDTPlhB4uBhI6L5vIrPS/ftiO
++7zW+l2k/ltCj1nhNXJIXrywiY/W0UDtEuljfolzNydqS8SgIHOX19kAl4Oreopz
+m+295FXWVUWFIdk7Ob4MmqGnLFGf+O3WwwXo4AqMbNrgcgyXs5yeuDYMnptI1fSZ
+xyHqls9CJ7Iy+gawtN8/wZcpjsQzcs4GoC+fD/R+9kNFjBj67/YzUtjrTOrGFVXA
+vAuo4vLbW2YJ1SGACJKz1HwXx8sVjwyHhEDKvfxIEmAoN/QZ90UBzqG3Yx5B4YIP
+uzt6ADKYVYI6JE1EP8Lkd8SvfO/peY0qtMm5/abYF5n+aE1ocZee+S0oIvdDOQ//
+9qE2WlKYgU2pAJ31KABE4GzTgh4mQ3Ip7NfijzFNssfQ4RoVjgTe/aFuUSyZVe6/
+2LGPjb7sd682u5U2ILlMa7KPaP0egK0KR5LqWBFO8Ju4Z8X/MvSmtzVHNgcFbJlR
+OEIKd5uGndPteqekCx4c/YPgh3ejNQIDAQABAoICAQCD1f+rN35PmlfRhaQ42sRN
+zDogQ7aTcqPQGojvW6vN80dhEkUUcGkcC7uHx5FrucWSHVT4Z7Pt22qcBQlNzgN+
+D01HhIWnYE5j+976XPiaoumd7MoDqIKXDrg2Pwfq5lWq9slo9vKyIZNu+aKhy651
+I2tW3Fs9vRpwkVoy+FHt+5GYbIRhxtKC/1toTEkJhigAbSb3nyUkQ/ClRKY7U2cs
++vY4Ddse7XvOt4m+b7yG8ZP7GwvACbeY3UQNrfeGvYvqp3pmwFB3X9bFe8SBHaGS
+3ZLAMzMkllOS2x0RlGfS6qEUfOFw+miPHe3W7u8OE5nbrQoiBtRQx0MKj9F1dYKA
+AA/BWbBAgt+O92qo+OKQAwu/62cupSpX935SGT2Rhu3H9MktWL546aXVe2XRDhGL
+wFnEyxXBMNn4g1pAN3yE0y2S5JSmtuu+HkKh5ti+Kbd/VxYeebCse9QvouD+BtS4
+akv4/BPAvdag+vk7XxuCYcvd03QXDSO73ozaDX4LNMX5EcLgpgB2Up2raWoQb1XN
+LBt0+luxpe9717UzuL08j2pUojYwH4sMfGdNlBR/78AbT7EtHjrRXaA39YOaZSOF
+U48d49F3XEDgJ/h3zyP87729dxQFYDyCq7gvs5BpTvph57LzV752WYaoNkpdyWvb
++c1KSVnBLkiYr5m2e6LCAQKCAQEA/MB7S1sWc2pupKqL47b9w643DZun4M14CiEK
+AmB0TpE6O/VUb9eYcMASY/ndCdpGDLKcoCLmHCmhtezjnT/lmUAo0Hei46Vw69vP
+ujYJgYkw4/e5iiLTQopfN4sKffJeQFVEnIHA5CwAmCIwNTrJ1c2f03OJirldJY37
+0h1HAmobxvOJXf4muvEHnDCWDNXXRA6nrT9I8Jg3jx7i0l0Vv0T6qPJAsccpSwy5
+Rpz4+p4R6sbzTCYBt1jr/PWP9eyBS4m5bw0Ys7ZJ6X7n79rQtqXGqOHK5ppdUO4o
+bBA+VH45eNebxVKLSoIe0gJahowsYVSVTqPJenlUESm5B8dpFQKCAQEA6VCNDktT
+JJlONmKGjCZ09NosZrYv1MCrH9prpSIUUYRSbXPHHkxAx6zBlSxwVh27DTIfOt/G
+18bXAQc/nuUWPqzZwoEIGtyUhdGwFujPfpFbJoZadA6HIjm045DCqxn7yfWLFYkx
+m7Iy9ANtLWWrAGRVPRvpg1EDIkFaEeMxKurpxGvkU3LX8lA7+9Ubo2pEyfpIE7oa
+azc52c0xfEkYgtGr/8Mbq2C5JNhfWrMjzw25jg8Ocr+O6FBkBbLha6nVMBofVjNZ
+96TRsFz9OlDu5K7bFFIx15yLaGbNd2jJTyKiaVTipsaQMTxXabLJfyZNjrEPA9Pz
+aJTLKRuDDn2ZoQKCAQARaKiVXibDuFb6nIyaGKaN7df45fnAMCbOe8wWsdIQ/0vF
+iXZRZcYoLfKWVEV3QkOE6GCFXyH+Wpe60iAzWo1T6ulkwnjDuUd312INb19kPrDR
+YuSysQdgE+vPBZKpbiIzyCu7o+xHSwiXcfNkFzKDuXACvniAx5e02Hy50i5r6icT
+ov6ZLMI6KhPeHDKZm7kCBQhjlHJPsAxTnUr+Nk8jJ3skW9s843zioHO6e2Fi0bRm
+OWHUouGHYWaPu9I4nBujuk69aWeEKVAZ9xW+nZG2ouB2DWdOTt+SjXTXTJ8ebrtC
+qYcfJjpV3XSF/oeBsPH1mj/WdM2R0/2IWRlXgdKpAoIBABya3qBpBcmP7jHmxH48
+XMyETztMjPK1qIVgPyBg3ELeSUjYEAqb6LlSae2DJEa6oGtOwNt0AioEW+npXJh7
+l82ZXZ1mOnsoniEGA2PbqUzoP1eq0z41ZcYBczcPUX6u0dsB+spqJqXjJDIclW8i
+buO+aWDzoh6SeSLjBkr5ItcTNBP78mN0yhsQUTpf92KCrephgCLDB2grvjEA4ldN
+ku6/DCpwXl0Vn71vtckl+3bwRNaw6+GPsNK0wH6eXtrXWKbsHPlxlE8zau4HiJh0
+wcVR1tRX+3pm3ASxzfEc7MmCAo2Ndbhi0dznfAQegmvPY2TiOmgKvWYOEBZ7JAdL
+yOECggEBAJzuFWAq944zeUcgTqkvr658nkxIT0ax5xv9cwlax1Ts43YyEsWXSj4L
+sqhiC+zQWBYnhxHWrpdg5OMnsvJgNXhj4TQdH/3y62eM6LwxskZXuIWhFK4xFQAr
+aTpY03InOifSjCrGNWcHFoMtKCCtddXUYbkCq149jJopmNijNcYie6T8pk3D17H0
+v4VzmlrYPLbdV55K82nXVMJ+iMMqDINp7u25spcs2zvdtep8lLwVoUkvt5+KdTu8
+5DdsFsTBYqJxLk4Veiw4hMtox2gPZ39sqQpWHerWmiLQT33i91fIHxmNlJ7w3K/i
+fOZsdRaGnkp8gsf0x9SU8PUvdo6ZrLw=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8079_key-certbot.pem b/letsencrypt/keys/8079_key-certbot.pem
new file mode 100644
index 000000000..b135ecaaf
--- /dev/null
+++ b/letsencrypt/keys/8079_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC8RWb5cRkvh/QQ
+O9jZJ9RVj9nZbAAkOlBWzFSfQk8zi0aAbfd1mvVbzZ0EnAdSK9iSCZKES07yJkvI
+HI1Uzk8p/T+QFBpn2PI6xG56vRuyXslfGa8Td3sExfTJ52Vq5mnlQzI0zc/HfsM2
+MiH98ZS4v1Z1elnnB8IE/1cNrr1rcFYF0TsF6fnf6C4qCRpgSSl2C1W2eX/sR5IU
+1O1HOnYFYe2WaYGd/lJ0xKTHZjHOSmhqrHIce1SXSGz/2yDBVEXTI0pNZaWhXtys
+HrOlbDDHzHWH62UcmWsEdhuZddSJy++3kHi194Ds/kCg0GFV04pHQGb2be5tWfJT
+kpm/pADRAgMBAAECggEAeEdqgx/jND+KCDkDz7AnckZFqibabEqo+trtkRVe3hIz
+h2c5ufO2nuDcWI6KCtAiOyJMbaJjHEalEYJUNILdhnjZe+Wr/P5Xun22C0n3gNwX
+kF8rP6eMez8wpTDk1QfBTYvBboSyIsR0WJJsrv0Aw4rR5Jm3B+cn5+NtLTuenhz8
+7URJb8mFk6ynmHhTsAslIk9iAm3TYU2yKz0hKgq9BOtAT+S47hei6Y7aW9zG8Xb2
+GbpT7cBQlHTiRo5L0lRIpLtOV2qAAT+9o6wKkSBAcSNC7AkN4sX3Vcy3MHUatqGK
+PSiQt2NPjgBXXJMY2NlmLnDLWsZwHnZNwWGQPHYvVQKBgQDhMq2tWpsv8yumqEIF
+NLgh20JRc0cjbpT4DPMryNkl0UQmdIRQgIQhiGvRXIs0iiknQCnAJB2jecdC26gD
+VvPwDpn3uUbt3bBLrMzWhgJYAkv0eIXeXlhYw82sBveKt37VWojJoCApdUmnUldr
+hpCD9BUDJj2XRJatAnp8I0aobwKBgQDWBbo0pobRbQHSNfeBzpTFRIibR+yRT82e
+MFzlQuaWJbJ21qJQizg2KXkg1RjJrzEpGI5pjUQpn6HuzjLLblmXU0NWdn9ELMa0
+1K44DC3QISz1NjwdVvQu5kgz6fNaFL/8S4nF0ZABog3GGbi3toi3JUNuv42VlkFX
+IsOeRigKvwKBgDpwe0+ENsdvtEEwYsmVD7+BdalLYAea17+zJJuVKHy+3I+aJwf5
+AdDt5QTUni9JNzq/VNZOyP42SPZZqDUNqIoAUAZQJ07s+6X3tsRozEzoc6uCZ0L4
+era2QTZGLJDr41ccgmjIS/BWRoHMRXFa3z/O5HEHyG3r16oX/Y8fXGOzAoGAMqTg
+Tx0owd3dlHSYwOq1YYi6GqSGYkxUB57CHK4cCmOZO23GsvB+uLJPq2lBmFgQdf0N
+lgSLoJ3Zn7zDYEgYgyp8wLUBoIxH6Pp6z2ByZtGy5cOTrg2pcn+jjkVKBILsezMU
+wu63+Orz/3COuUpER7JVpptFUaRgidH8IDPRvdkCgYAmbJIUbFfLCFRDYXmGFb0i
+S/vc5V6XeaL1Aya4PKgfTVOPCbFs/7lxpAuokJuqHYKKF/IhJyvijBQUzBYDzM0A
+6yan9cfh1WHAGOjRIkrELx8nBHUYNsjBDI3KmicJojz0zvCYB7RLYsudAyZDzs5z
+U0hQT3/8pGQ7DRH4H1J+9Q==
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8080_key-certbot.pem b/letsencrypt/keys/8080_key-certbot.pem
new file mode 100644
index 000000000..4825b6f21
--- /dev/null
+++ b/letsencrypt/keys/8080_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCx05xEh9/den8V
+sPIgm4/CesZt+2ac3dsaFOwJn5u4aU3RT2BuZEyVHUU+vBYbVur7l6fEsIOOJdDs
+/1e04RjQ6dLTeYRJ3NtCqV3zd6YyDt8ll8PDc6LnawllTw2+fk/MZ623/GTVKcgZ
+IhnOWEEantWXVrg/nT7X82i+CLjTm8GGChQ28Im0yHmHNWvthePMRFEy/ev3F59F
+vRUUmo1FSctIGq0Mu41J9uloCAs6EHiSRK15/tnfKi2xdOX/3Avx6o+CYj/Mslh3
+i5E7lHTZ2PSsyOGEUVuGXd8B6swc1nzDIeaIpvkrdzNwI4Xi4WYF5cgwltX3CMij
+gyTZuf1RAgMBAAECggEAKJvAVc4Ji1RL7TIpONUNcUYERl1gw3XOcRhSBqiSMPyr
+Lp9H0C3LZ0n15CujiL7Cjo3FXB9LC40LNvPgnYfB2QNsh6p6UTvEPmba85xhMZE/
+2B/eLqYbj2lcDeyNoPDLXExY2WkjxaHy9fpZlkuFIoUfFZ5SGQTZswr84livjHLl
+sEneba+Si/khW6LGguzLPAoGMQdwiin77DLhnr7gaK+Jni4iqJ+8oZUT4pb/Q0Ke
+gEn2aXcnhukRuEG7/Q59Wi2zZjiXMYQzOGOpcmL6IQwHsvtjZz9/V3NfdUyHgQJP
+e4oYCBEJwVjwoBSrfmJb2t1eXKU7ThvkiSHy9mSo+QKBgQDciD+HPRIyrvmSBryv
+rAdbuaJICxjACQws3FCnWWdGFWdw0+CiZpuzKbq5IEfo5ETZh86I510IopslkZo7
+hIimpFCvKF8dFhYRb58jcQikNm0qTS/bLhPFodz+eL6g/rgjE+I/MuvsoZX++5++
+pz9em2VFy71S0mJF0iA70cdCUwKBgQDObRY2f6IOb1qzjn7szmL0cEfi2xkccGnV
+T/T3pEVA1NDVCVJrayNas7kixc1x1jmdAcOVlMK2Em9XeJKC0VuiL+NVl/fj5nta
+n6r8e+NaECP4GJdxyEjDK+xrqPRkFi9PfgbEr2ELD5kfgCiUTyK56E8E+gQbDP1/
+jONNVNxVSwKBgESIGqXeNp+FfI0ChvRYk1jP0TxuJlzW8u+l73Jx+APxdtm7Hh2Z
+oV0F5L7O50naVgL7jxVAQMsELQ55tuI0B3sxqNklxJj3WhhFBcEvyS2utDHnFq4Y
+HZDXAiQaRbMmNPbBoRdera41cLVyYGwQ8UJnLAuKiuUH9/4WlGnCgRd9AoGBAMdj
+uUwE9rzotHyxzEnihNTFS7qFlXjR4HhJ1j4J71bS+bB9Y54ci7bF2LMMywgFO/s7
+Q/dNDNKfderQrPwtS0ya4wS/WJNLAqWjip588DsDUisHXelq41WaLLBFL2MpxqML
+AXCkUqFDfM1fllLDKbDXAtS0xph2cLnulXQR3w2HAoGABfYtKQU2Tsy9+qD4ZwrV
+aHEs72OwGIicwf4wzmZ+bfAtxprs8piV2LKL1B+ZKsIUT/sl3hKiqKNWWi9XFDSY
+231Jd0wW8X3kA+Xg6Bz0QPPok48izR4/iHeTBRlPA6t1L7jIejZEQgcWz8+oYzfq
+/NkDCVrWFQWsFfp3aq+jbSo=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/keys/8081_key-certbot.pem b/letsencrypt/keys/8081_key-certbot.pem
new file mode 100644
index 000000000..558ffc213
--- /dev/null
+++ b/letsencrypt/keys/8081_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC2x2aUvc1mTnRS
+EOEZGp11XIEyDtu3g0PpnKW/ua7/CSy0sEoQyj96iqpnNfI7VFgipkwwVRBVsTCH
+Bd7Co8+pwp4EbM4E/qiP3/MzStpfsAkmiI0fLZ8Ol62e4CbRjSF9YVqKOZdjFdv/
+Y9KzcQHeRwAK+PEmhfadS+UnUq7pawLKgax4mGEftyPOSxOMfNk7x0IAlyBlNmaq
+I1Qf39QCTVQoWvWXjuOS89oLy1+QgWPHUQ50q8nFmC7o9rFJKKozFkasZtRUz/0C
+LlN1BCrSIr/hdCmiEO26E5QMC/ENFcQegDe/CeX2wfHPqGhacqCkpxY9dQ8hPvZK
+WmHzUQkTAgMBAAECggEANlywIeUhxh/ncNEcYf8Mfe95bY4Fw1sDQ+QXWCK97ZSo
++0TDgqLkpmm/rNrapNK9M/EKEAX8yb/dkwsn6fQWu4LqxJ4n2Ex1jfUpvEOzF2qg
+Dhnm/zLub8SlGu/IG+NB5qyh5SKj6BCEUj06WaxuxdGQLbNE5hRJ+RatnTh2VW3B
+xUjkUUG3qI73Ru0I8ip6ZuyScXc5cRmKRpe8dShAjRv2Kd1cM6/E7ESpgAUdZ8PI
+e5yhjj6ccXNxFo+CFx/WWVDNL/8bYcbnDeU2nPYGHfJjxYCxh0PGm+crNRoC7l0f
+p1cD39UBm7vxlckroySCUdfOYmpjVThBgFVbs385YQKBgQDaBtiKd0yiiDIGcED9
+fYQX4Qe8b7ezzIPHnRgwr1RSSGl3XNT/i3Bn8W0xPE4/QmepEEACxkFXtcbmdIsc
+5iTM/im9XxFxdphK8H0pXBzj4xnU/7oFpre7WqFuqvQElcDQ2ebnTnexZnLGYsSZ
+5zrZ78lNBqzwlxEqp22NdC+u5QKBgQDWnPXdUH2xUsVC55H+iJiply0XKhf3LYp+
+RIvBSy8GGEmhkJYCboQudR0YOhllsQHSrcDc41DTda7kZyx6MKlu3pGRA5+7AlTJ
+6MOmXXPRkoPgvnhuypRTa9IV4MnbcKjExNpPPx/slPblAa79ny/t6zYlVIGK7F78
+A0nDTn9glwKBgBVIB8j0PiG7Q47HVECqCMO/7l5hVUASnWZVmi/eXU+uy8Sf5haP
+iMhMk4jzxvt7wtyIvobGzUf/cUu7YnzOphbwVCis5+n4VoMyGDV6TUOdPj9BOuok
+TNjXztwbibgM2gZIzrYTPbGuO1PL/j67iE4Pjsma9jSBumY8c4AUMDdVAoGARzbw
+cw8JlnTj1k6naHIFTolGwiAKsc/f3AR855g+M2SN0ln7HTV1EUF1dRuaX987vqA/
+lkyr/m9XqJz/6lAJeSvL2/X65ABjCFj/y03JZ+qZblNl/UWlsITfwrjD4thgeGLm
+GlPVERlhUB6d5bUUH3vkjMCc9+91mWSx7mg25mMCgYBM6/7M3GinbyFI8jFDU7DJ
+tzJuSGTdwB+vYoEYF8YGg6szf43BgNNufAExzirhhS2l3AwICVoL9uDz/80biXfj
+3PvnZhW5/TsnBh2p4hisSbbnPlEZ9NTGiCtxVuzYj+mCJTdgiUogvv36TNZHcZ8a
+PaQeC1+WYJrqV8Ua5FzXcQ==
+-----END PRIVATE KEY-----
diff --git a/spamassassin/64_myRules.cf b/spamassassin/64_myRules.cf
new file mode 100644
index 000000000..2db48a1d8
--- /dev/null
+++ b/spamassassin/64_myRules.cf
@@ -0,0 +1,209 @@
+trusted_networks 192.168.178.0/24
+
+body LOCAL_DEMONSTRATION_RULE   /dasistmeinteststringfuerspammails/
+score LOCAL_DEMONSTRATION_RULE 25.1
+describe LOCAL_DEMONSTRATION_RULE   This is a simple test rule
+
+header   LOCAL_VIAGRA_SUBJECT Subject =~ /v[:\#\.,~|\/_ +^-]*[il|1X][:\#\.,~|\/_ +^-]*[a@][:\#\.,~|\/_ +^-]*g[:\#\.,~|\/_ +^-]*r[:\#\.,~|\/_ +^-]*[a@] /i
+score    LOCAL_VIAGRA_SUBJECT 25
+describe LOCAL_VIAGRA_SUBJECT VIAGRA_SUBJECT
+
+body     LOCAL_VIAGRA_BODY / v[:\#\.,~|\/_ +^-]*[il|1][:\#\.,~|\/_ +^-]*[a@][:\#\.,~|\/_ +^-]*g[:\#\.,~|\/_ +^-]*r[:\#\.,~|\/_ +^-]*[a@] /i
+score    LOCAL_VIAGRA_BODY 25
+describe LOCAL_VIAGRA_BODY VIAGRA_BODY
+
+header   LOCAL_XANAX_SUBJECT Subject =~ /X[:\#\.,~|\/_ +^-]*[a@]*[:\#\.,~|\/_ +^-]*n[:\#\.,~|\/_ +^-]*[a@]*[:\#\.,~|\/_ +^-]*x /i
+score    LOCAL_XANAX_SUBJECT 25
+describe LOCAL_XANAX_SUBJECT XANAX_SUBJECT
+
+header   LOCAL_VALIUM_SUBJECT Subject =~ /v[:\#\.,~|\/_ +^-]*[a@][:\#\.,~|\/_ +^-]*[l|][:\#\.,~|\/_ +^-]*[i|][:\#\.,~|\/_ +^-]*u[:\#\.,~|\/_ +^-]*m /i
+score    LOCAL_VALIUM_SUBJECT 25
+describe LOCAL_VALIUM_SUBJECT VALIUM_SUBJECT
+
+header   LOCAL_VICODIN_SUBJECT Subject =~ /v[:\#\.,~|\/_ +^-]*[il|1][:\#\.,~|\/_ +^-]*c[:\#\.,~|\/_ +^-]*o[:\#\.,~|\/_ +^-]*d[:\#\.,~|\/_ +^-]*[il|1][:\#\.,~|\/_ +^-]*n[:\#\.,~|\/_ +^-]* /i
+score    LOCAL_VICODIN_SUBJECT 25
+describe LOCAL_VICODIN_SUBJECT VICODIN_SUBJECT
+
+body     LOCAL_VICODIN_BODY  /v[:\#\.,~|\/_ +^-]*[il|1][:\#\.,~|\/_ +^-]*c[:\#\.,~|\/_ +^-]*o[:\#\.,~|\/_ +^-]*d[:\#\.,~|\/_ +^-]*[il|1][:\#\.,~|\/_ +^-]*n[:\#\.,~|\/_ +^-]* /i
+score    LOCAL_VICODIN_BODY 25
+describe LOCAL_VICODIN_BODY VICODIN_BODY
+
+header   LOCAL_SEXUAL_SUBJECT Subject =~ /(porn |sexual|orgies|orgasm|penis|pu[sz]+ies|pu[sz]+y|s[i|l]ut+[i|l]e|s[i|l]ut+s|[^a]t[e]*n[e]*[sz]|[^k]ana[|l]|l[sz]eb[il1|][a@]n)/i
+score    LOCAL_SEXUAL_SUBJECT 3
+describe LOCAL_SEXUAL_SUBJECT SEXUAL_SUBJECT
+
+body     LOCAL_SEXUAL_BODY /(porn |sexual|orgies|orgasm|penis|pu[sz]+ies|pu[sz]+y|s[i|l]ut+[i|l]e|s[i|l]ut+s|[^a]t[e]*n[e]*z |l[sz]eb[il1|][a@]n)/i
+score    LOCAL_SEXUAL_BODY 3
+describe LOCAL_SEXUAL_BODY SEXUAL_BODY
+
+header   LOCAL_SEXUAL2_SUBJECT Subject =~ /(cum+|blow|oral|adult|amateur|Hard[:\#\.,~|\/_ +^-]*[ck][o0]+re)/i
+score    LOCAL_SEXUAL2_SUBJECT 2
+describe LOCAL_SEXUAL2_SUBJECT SEXUAL2_SUBJECT
+
+body     LOCAL_SEXUAL2_BODY /(cum+|blow|oral|adult|amateur|Hard[:\#\.,~|\/_ +^-]*c[o0]+re)/i
+score    LOCAL_SEXUAL2_BODY 2
+describe LOCAL_SEXUAL2_BODY SEXUAL2_BODY
+
+body     LOCAL_SIGNUP_BODY /(sign up|stop sending me|dislike e-commerce|go here|to join|No More Mail|take[n]* off)/i
+score    LOCAL_SIGNUP_BODY 2
+describe LOCAL_SIGNUP_BODY SI
+
+header   LOCAL_PHARMACY_SUBJECT Subject =~ /(pharmacy|pills|pain|medicine|^[rR][A-Za-z]+-[A-Za-z]+[iI]$|r[:\#\.,~|\/_ +^-]*e[:\#\.,~|\/_ +^-]*z[:\#\.,~|\/_ +^-]*e[:\#\.,~|\/_ +^-]*p[:\#\.,~|\/_ +^-]*t[:\#\.,~|\/_ +^-]*f[:\#\.,~|\/_ +^-]*r[:\#\.,~|\/_ +^-]*e[:\#\.,~|\/_ +^-]*i)/i
+score    LOCAL_PHARMACY_SUBJECT 10
+describe LOCAL_PHARMACY_SUBJECT PHARMACY_SUBJECT
+
+body     LOCAL_PHARMACY_BODY /(pain killer|pharmacy|p[i1|!]lls |d[:\#\.,~|\/_ +^-]*r[:\#\.,~|\/_ +^-]*u[:\#\.,~|\/_ +^-]*g[:\#\.,~|\/_ +^-]*s |cheapest)/i
+score    LOCAL_PHARMACY_BODY 1
+describe LOCAL_PHARMACY_BODY PHARMACY_BODY
+
+header   LOCAL_GIRLS_SUBJECT Subject =~ /(cheerleaders|girls|babes|ladies|asian|female|chicks) /i
+score    LOCAL_GIRLS_SUBJECT 1
+describe LOCAL_GIRLS_SUBJECT GIRLS_SUBJECT
+
+body     LOCAL_GIRLS_BODY /(cheerleaders|girls|babes|ladies|asian|female|chicks) /i
+score    LOCAL_GIRLS_BODY 0.7
+describe LOCAL_GIRLS_BODY GIRLS_BODY
+
+header   LOCAL_BOYS_SUBJECT Subject =~ /(boys|boyz) /i
+score    LOCAL_BOYS_SUBJECT 1
+describe LOCAL_BOYS_SUBJECT BOYS_SUBJECT
+
+body     LOCAL_BOYS_BODY /(boys|boyz) /i
+score    LOCAL_BOYS_BODY 0.7
+describe LOCAL_BOYS_BODY BOYS_BODY
+
+body     LOCAL_VHN_BODY /Get Vicodin, Hydrocodone, or Norco/i
+score    LOCAL_VHN_BODY 7
+describe LOCAL_VHN_BODY VHN_BODY
+
+header   LOCAL_SOFTWARE_SUBJECT Subject =~ /(Microsoft|disc ounts|Updates) /i
+score    LOCAL_SOFTWARE_SUBJECT 1
+describe LOCAL_SOFTWARE_SUBJECT SOFTWARE_SUBJECT
+
+body     LOCAL_SOFTWARE1_BODY /^[ 0-9\$¤\.]*Borland Delphi /i
+score    LOCAL_SOFTWARE1_BODY 2.5
+describe LOCAL_SOFTWARE1_BODY SOFTWARE1_BODY
+
+body     LOCAL_SOFTWARE2_BODY /^[ 0-9\$¤\.]*Microsoft (Office XP|2003 Server|Encarta|Windows Vista) /i
+score    LOCAL_SOFTWARE2_BODY 2.7
+describe LOCAL_SOFTWARE2_BODY SOFTWARE2_BODY
+
+body     LOCAL_SOFTWARE3_BODY /^[ 0-9\$¤\.]*Windows 2003 Server /i
+score    LOCAL_SOFTWARE3_BODY 2.7
+describe LOCAL_SOFTWARE3_BODY SOFTWARE3_BODY
+
+body     LOCAL_SOFTWARE4_BODY /^[ 0-9\$¤\.]*Encarta Encyclopedia /i
+score    LOCAL_SOFTWARE4_BODY 1.5
+describe LOCAL_SOFTWARE4_BODY SOFTWARE4_BODY
+
+body     LOCAL_SOFTWARE5_BODY /^[ 0-9\$¤\.]*(Corel Draw Graphics Suite|Corel Grafix Suite) /i
+score    LOCAL_SOFTWARE5_BODY 1.5
+describe LOCAL_SOFTWARE5_BODY SOFTWARE5_BODY
+
+body     LOCAL_SOFTWARE6_BODY /^[ 0-9\$¤\.]*Quark Xpress /i
+score    LOCAL_SOFTWARE6_BODY 1.5
+describe LOCAL_SOFTWARE6_BODY SOFTWARE6_BODY
+
+body     LOCAL_SOFTWARE7_BODY /^[ 0-9\$¤\.]*Macromedia Studio /i
+score    LOCAL_SOFTWARE7_BODY 2.7
+describe LOCAL_SOFTWARE7_BODY SOFTWARE7_BODY
+
+body     LOCAL_SOFTWARE8_BODY /^[ 0-9\$¤\.]*Adobe (Creative|Software|Premiere|Photoshop|Illustrator|InDesign) /i
+score    LOCAL_SOFTWARE8_BODY 2.7
+describe LOCAL_SOFTWARE8_BODY SOFTWARE8_BODY
+
+body     LOCAL_SOFTWARE8_BODY /^[ 0-9\$¤\.]*(Autodesk|Autocad) /i
+score    LOCAL_SOFTWARE8_BODY 2.7
+describe LOCAL_SOFTWARE8_BODY SOFTWARE8_BODY
+
+body     LOCAL_HANDY_BODY /handy-zu-verschenken/i
+score    LOCAL_HANDY_BODY 5
+describe LOCAL_HANDY_BODY Handy_zu_Verschenken
+
+header   LOCAL_JAPAN_SUBJECT Content-Type =~ /charset=['"]?iso-[0-9][0-9][0-9]+-jp['"]?/i
+score    LOCAL_JAPAN_SUBJECT 6
+describe LOCAL_JAPAN_SUBJECT JAPAN_SUBJECT
+
+header   LOCAL_MISC_SUBJECT Subject =~ /(GESCHAEFTSVORSCHLAG|WINNER|CONGRATULATION|Small.Cap|Small.Stock|Small.Stox|\[QUAR\]|Schufa)/i
+score    LOCAL_MISC_SUBJECT 6
+describe LOCAL_MISC_SUBJECT MISC_SUBJECT
+header   LOCAL_MISC2_SUBJECT Subject =~ /^ *(Hot|Investor|Look|You|Will|Only|why|Watch|this|Take|Our|Super|Stock)/i
+score    LOCAL_MISC2_SUBJECT 3
+describe LOCAL_MISC2_SUBJECT MISC2_SUBJECT
+
+header   FROM_GMAIL       From =~ /\@gmail.com/i
+describe FROM_GMAIL       From:  verdächtige Mailaccounts
+score    FROM_GMAIL       3
+
+uri     URI_OBSCURE   /[\/.](geocities|canothseoldand)\./i
+describe URI_OBSCURE   Mails mit verweise auf obscure Seiten
+score    URI_OBSCURE   4
+
+header   LOCAL_NACHBARIN_SUBJECT Subject =~  /Deine Nachbarin/i
+body     LOCAL_NACHBARIN_BOBY    /Deine Nachbarin/i
+meta LOCAL_NACHBARIN LOCAL_NACHBARIN_SUBJECT||LOCAL_NACHBARIN_BOBY
+describe LOCAL_NACHBARIN   Deine Nachbarin
+score    LOCAL_NACHBARIN   25
+
+body     LOCAL_CASINO_BOBY        /(Poker|Jackpot|BlackJack|Roulette|C[a@][zs\$][i1|!]n[o0])/i
+describe LOCAL_CASINO_BOBY        Gluecksspiel
+score    LOCAL_CASINO_BOBY        5.2
+
+header   LOCAL_CASINO_SUBJECT     Subject =~ /(Jackpot|BlackJack|Roulette|C[a@][zs\$][i1|!]n[o0])/i
+describe LOCAL_CASINO_SUBJECT     Subject: Gluecksspiel
+score    LOCAL_CASINO_SUBJECT     5.2
+
+meta     LOCAL_CASINO             LOCAL_CASINO_SUBJECT&&LOCAL_CASINO_BOBY
+describe LOCAL_CASINO             Subject&&Body: Gluecksspiel
+score    LOCAL_CASINO             25
+
+header   LOCAL_VNRVERLAG          From =~ /\@vnr-verlag.de/i
+describe LOCAL_VNRVERLAG          vnr-verlag
+score    LOCAL_VNRVERLAG          22
+
+header   LOCAL_ADVERTISEMENT_SUBJECT     Subject =~ /advertisement-[0-9][0-9]*.pdf attached/i
+describe LOCAL_ADVERTISEMENT_SUBJECT     Subject: PDF Advertisement
+score    LOCAL_ADVERTISEMENT_SUBJECT     25
+
+header   LOCAL_PKV     From =~ /\@pkvtestbericht/i
+describe LOCAL_PKV     PKV Werbung
+score    LOCAL_PKV     25
+
+# HEADER_FROM_DIFFERENT_DOMAINS
+header   LOCAL_MALFORMED_FROM      From =~ /<.*\@[^,]*>[^,]*<.*\@/
+describe LOCAL_MALFORMED_FROM      mehrere Absender in <> ohne Trenner (RFC 2822 Sec 3.6.2. Originator fields)
+score    LOCAL_MALFORMED_FROM      6
+# https://wiki.apache.org/spamassassin/FromNotReplyTo
+loadplugin FromNotReplyTo plugins/FromNotReplyTo.pm
+header FROM_NOT_REPLYTO eval:check_for_from_not_reply_to()
+score FROM_NOT_REPLYTO 3.0
+describe FROM_NOT_REPLYTO From: does not match Reply-To:
+
+#full     LOCAL_GIF_CONTENT        Content-Type =~ /image.gif/i
+#rawbody  LOCAL_GIF_CONTENT        /Content-Type: image\/gif;/i
+#describe LOCAL_GIF_CONTENT        Content-Type: Gif-Bilder
+#score    LOCAL_GIF_CONTENT        3
+#
+#full     LOCAL_INLINE_DISPOSITION Content-Disposition =~ /inline/i
+#rawbody  LOCAL_INLINE_DISPOSITION /Content-Disposition: inline;/i
+#describe LOCAL_INLINE_DISPOSITION Content-Disposition: Bilder Inline
+#score    LOCAL_INLINE_DISPOSITION 2
+#
+#meta     LOCAL_GIF_CONTENT_INLINE LOCAL_GIF_CONTENT||LOCAL_INLINE_DISPOSITION
+#describe LOCAL_GIF_CONTENT_INLINE Gif-Bild inline
+#score    LOCAL_GIF_CONTENT_INLINE 5
+#
+#rawbody TESTTEST /GBCodCwMBCXd5rW2ozcKZ1vNvRVExg/
+#describe TESTTEST TestTest
+#score TESTTEST 555
+
+header FROM_RU         From =~ /\@.*\.ru[">]*$/i
+describe FROM_RU       Mails aus RU
+score FROM_RU_TO_RS -10.0
+score FROM_RU 10.0
+
+header RCVD_VIA_RU    Received =~ / [a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+\.ru /m
+describe RCVD_VIA_RU  Received via RU Server
+score RCVD_VIA_RU 3.0
+
+
diff --git a/spamassassin/plugins/FromNotReplyTo.pm b/spamassassin/plugins/FromNotReplyTo.pm
new file mode 100644
index 000000000..8d51f0229
--- /dev/null
+++ b/spamassassin/plugins/FromNotReplyTo.pm
@@ -0,0 +1,39 @@
+# https://wiki.apache.org/spamassassin/FromNotReplyTo
+package FromNotReplyTo;
+1;
+
+use strict;
+
+use Mail::SpamAssassin;
+use Mail::SpamAssassin::Plugin;
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+
+sub new {
+        my ($class, $mailsa) = @_;
+        $class = ref($class) || $class;
+        my $self = $class->SUPER::new( $mailsa );
+        bless ($self, $class);
+        $self->register_eval_rule ( 'check_for_from_not_reply_to' );
+
+        return $self;
+}
+
+
+# Often spam uses different From: and Reply-To:
+# while most legitimate e-mails does not.
+sub check_for_from_not_reply_to {
+        my ($self, $msg) = @_;
+
+        my $from = $msg->get( 'From:addr' );
+        my $replyTo = $msg->get( 'Reply-To:addr' );
+
+        Mail::SpamAssassin::Plugin::dbg( "FromNotReplyTo: Comparing '$from'/'$replyTo" );
+
+        if ( $from ne '' && $replyTo ne '' && $from ne $replyTo ) {
+                return 1;
+        }
+
+        return 0;
+}
+