daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 8191883dbdd06cabf167a0a060e9735b8bd69c93..7f8baf36e41cb9735ec631fe5ebaec7d7dab9569 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1642,6 +1642,9 @@ maybe chmod 0644 'letsencrypt/csr/0439_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0440_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0441_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/0442_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0443_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0444_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/0445_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'
@@ -2086,6 +2089,9 @@ maybe chmod 0600 'letsencrypt/keys/0439_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0440_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0441_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0442_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0443_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0444_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0445_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'
@@ -2349,6 +2355,7 @@ maybe chmod 0644 'popularity-contest.conf'
 maybe chmod 0755 'postfix'
 maybe chmod 0755 'postfix-policyd-spf-python'
 maybe chmod 0644 'postfix-policyd-spf-python/policyd-spf.conf'
+maybe chmod 0644 'postfix-policyd-spf-python/policyd-spf.conf.orig'
 maybe chmod 0644 'postfix/dynamicmaps.cf'
 maybe chmod 0755 'postfix/dynamicmaps.cf.d'
 maybe chmod 0644 'postfix/main.cf'
@@ -2365,7 +2372,7 @@ maybe chmod 0644 'postfix/postfix-files.d/mysql.files'
 maybe chmod 0755 'postfix/postfix-script'
 maybe chmod 0644 'postfix/postscreen_access'
 maybe chmod 0755 'postfix/sasl'
-maybe chmod 0660 'postfix/sql'
+maybe chmod 0640 'postfix/sql'
 maybe chmod 0640 'postfix/sql/accounts.cf'
 maybe chmod 0640 'postfix/sql/aliases.cf'
 maybe chmod 0640 'postfix/sql/domains.cf'

diff --git a/letsencrypt/csr/0443_csr-certbot.pem b/letsencrypt/csr/0443_csr-certbot.pem
new file mode 100644 (file)
index 0000000..7ffa271
--- /dev/null
+++ b/letsencrypt/csr/0443_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ5F
+bE9qoEFFs87ZKcBEk3/sVL+5ll3zRqixVVjwMk11KOWsW/dPUTmdhXf07DPgKBRW
+kyLMkv78I1X+zJsRxWbMWndH2WcPNGQfoO/xt0/8E0xJQgWQDMSwHC0lTZH1Xo0n
+UwF0jwxaksylOuP+ThQhIIOxgAXQxmNZx6I89vhlrgkxEg4Glz9fOv812IKK4fCY
+l9h5bCaXAjmDzYP1kM+l9E4gKqdMf4D2aVCU9KfyY0Bmiga8cMMTDa1J5444fLJk
+dSIKrHTnu3jI0omSHIiFnAJEIi8HXBJst0ujNkqKVA/zSJQnjLbsYjgWKJqwI9ZA
+2Lm7tgGGmyejmFYBb28CAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw
+EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAOG7F3l/3I1h40
+gjetmA4o8L30ZKT7G2EwEwcjS5Qda3tdbudXHFL6esaWchmH5xfX0P5jHXcl8vv7
+7sR3OZ8bVWsIsYSFq6zB2xkpTj8P3T2UGu+dfO8G9VHql1Q2oIgW0+g6u45Pik3W
+DQfwm1PKTGaF6342Ey91fveaVxL3obPHc6hAFDB/bBcTl2uMDIm+/TSXnF7nqFP4
+LaKkrZcWkV4UGRXwCnTvNfLc2JLS5G4zZrCv2Y4+IKUCtgWvmbnkt6aPcXAiwuzT
+XIIu3XHZpKLvVQAuh5gu4HhDj1QtX3XteNBxlThBtTbTT/gqItIfAoHcsbWhjWTv
+vuCAZqIA
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/0444_csr-certbot.pem b/letsencrypt/csr/0444_csr-certbot.pem
new file mode 100644 (file)
index 0000000..3469ecd
--- /dev/null
+++ b/letsencrypt/csr/0444_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPe3
+njizfCISbqQEyD/2UPYnmyi/8ifKRSFHi1vP+Ju7JtlNcJ5TVcBKC5nuGdZvqi1M
+iIMWljvYr25HLQ5ESa3E3RmE2q7W2NeZl1lsptb2VliPMW7zmi5SbTIQ0o95ymur
+5imE2Fgz4zWaYhqaxalzfgEHlOOg9Q+v2rPoaR07UkK/nOoXy/ppmX1x5wT/XIUA
+H5+NkinLEbebz3RT2QxSz7DQLun5r2Mf2zwF6Sl6Z5gdQvmx2GYszAsQxsExnOfE
+CWSdIh0RvQC6P7AjHkKs2qNbm5NIvtiEne03Z8v4ARQoUCzIq1D/BRYARhTdvneg
+bnBP43QSPkdMA2ykzx8CAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIUbWFpbC5ob2VsbGVpbi5vbmxpbmWCFGltYXAuaG9lbGxlaW4ub25saW5lghRz
+bXRwLmhvZWxsZWluLm9ubGluZTANBgkqhkiG9w0BAQsFAAOCAQEAL4XzAV30UUth
+l6GMIcrGMgSi0wiVCqhgC0O9l7P9GAeqN5MIahJVWQ4rSvRPWbxJrTRJsUd+jaVv
+mVK5MG4SbWw+dN9aKnOlT8sxSVVmVRevdzhcPt7NLQlwlZ8ZvZW03dFAFjfMmqhy
+SYNwwSRZsCmyiRJS5Psuz1PAGEs8ZfHm1TePf4LUrv9QFBny934yfTHKpW2Rfi9/
+5q3gU4DSckKoIZW0WufW7CMLV49iESc5c+sbONUGdGA14F3nhYLtDbqu4Fdb8Sso
+JFEqaERUJJp7MHtzjVT8/HrYhIhPm6+nxuzqoLvRMbMNA9b5G1/ZR04m9awaHI9/
+cQloTmF6lw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/0445_csr-certbot.pem b/letsencrypt/csr/0445_csr-certbot.pem
new file mode 100644 (file)
index 0000000..188bf44
--- /dev/null
+++ b/letsencrypt/csr/0445_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKik
+wWpz9caR4GDnFUSfx1ewz3Zea2Io+4hYtHyIPCidsy8R7fdb9Oc16zWNNLYbd8Kj
+6mcLrsn/RiQ6OI+jQhozxcWcawi5JIsy18/CsJCfQK1hloVPuZKOw6ElF8g6kPXH
+gEh5VpbWNbdutI/AgNdzPRO/xG5V2J0STIz8NCk6dj4lvITpVSHXxpyCDcYYJjcd
+v1yDcLCgg1s0RZqv5XMpsMkwAA/ZHplqRBAV8nXmiACnuny4gWB5f8+i6JSiFdlL
+fwi3vVW47wbOVwbevfxYFuWlqYwtgJZZxFvGIdBW7pKoxPCPqws1v6Y0n9y4u6CH
+i5MHyNAyTl66j0bnhlsCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAS6NwNdSspP6r
+TDhxejXyinEOjOs3Qz5pC0ABakkYVYGV5tRng45PvczWakB5ztjZFhnCJIrLf/Ag
+27dZXYjUcbX9vnoXjVF8oesjrGxQzAx3vZigSQHfJ5tTbvEYOSZ4iG4eIdxKhzlz
+gghXyKMvNvaXPWt47jHJpdsuOWMpIL1Rzqd/ZGrmSpnKumzK6aDtf47+KQLXaR+y
+j0b6NfPL/HbITiPcdI+plfT5Pf2er4GjtJjJKtlwOdR9z5T1mBXSgLh+x5qLbFOr
+8SXHnirulImcD7TLlAU1bvn3Gv5KuH7fiw3PG0HpjoMkJiZZVwdJh2E8nv/guCVa
+TToJ28U9Sw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/0443_key-certbot.pem b/letsencrypt/keys/0443_key-certbot.pem
new file mode 100644 (file)
index 0000000..7a536d3
--- /dev/null
+++ b/letsencrypt/keys/0443_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCeRWxPaqBBRbPO
+2SnARJN/7FS/uZZd80aosVVY8DJNdSjlrFv3T1E5nYV39Owz4CgUVpMizJL+/CNV
+/sybEcVmzFp3R9lnDzRkH6Dv8bdP/BNMSUIFkAzEsBwtJU2R9V6NJ1MBdI8MWpLM
+pTrj/k4UISCDsYAF0MZjWceiPPb4Za4JMRIOBpc/Xzr/NdiCiuHwmJfYeWwmlwI5
+g82D9ZDPpfROICqnTH+A9mlQlPSn8mNAZooGvHDDEw2tSeeOOHyyZHUiCqx057t4
+yNKJkhyIhZwCRCIvB1wSbLdLozZKilQP80iUJ4y27GI4FiiasCPWQNi5u7YBhpsn
+o5hWAW9vAgMBAAECggEBAIuFbZaQy1bfCERHYivRCCoT/x3Ij8qgg+B/+1nc3Ks1
+pejZyXS5YkQlHZyCt5p/dzV+oFRj/Q103f2YEWx9/QPDD9jo6LiWSbwdubTr44pK
+EAUG64GV2/ujuCMAKGKL6F8MlHrK8rOUQKbQ3ZpQ+yl5jn0pg08dHVZFtdvKXHjZ
+Xqe2MIUBUtct0qdxoCEDE/m6t6PXf8MqQ+GzEqzIFeFrjD8I74GJ7JuiNLGAwhKA
+VyoJSJb9XWMIEkue4IB0Ghpo2OMCZmL3gmkutXVFUR57WCxlJrprgb6cGEnmxKJV
+nJIdZi1pLHPbm6Kf5u0l4sagnShJUd1S9fnjIJmLHekCgYEA0WzDyvMCWc/+6Ltx
+SAAe/Z+xrTImaWNFuO/oDKztMnElBrPENZopDym0RXtq5vIvpCrM7L97OlhxSw/7
+LnzefEZY5o/1LJKhTeyCBIUY75YX1Sm+KLX0kSo8fmPXepuRHezvNZPmwbeKPMff
+/JWTn6NN5xCEXwZmWerE6VdADGMCgYEAwXhQVSI2os7witFwWSTe0oDzPy8298eX
+7Dz/Yr2zcWcvzw57Ef0s8oi0y03m3/9MS3cr8ylRdJesHmcDFTh8FDxe6yanfYwL
+sQkXn6VOjP4khvRTyFDZ18mr/kOJriVax/QQUO+RfS2HahI3SmQIFbOyxxUpNCrH
+ecec2RjJAIUCgYAdNQIJZ+LIC84NPzcJR5sK3B63fOsGf6XVqP+/5M4f3s+/I4sV
+vq5DQxm1JwU9uEEUsDNsQTg6ZuNGCLCLRzbwNg9n+GPFF54PdBCd+MIFh/VC8VNn
+8hhttmpBZkNDAjc26ThjTIE+Ow64c1e1rlasSOYwd4k+h3H20Fst/9Ea6QKBgQCQ
+iJF7CFRIzNBm5JBKCIFuQWd3jI5EDZgxpGAmJBIqZiwRQ4AtsDYj+n0WZNxV+yPE
+PQNYZUW1FJpBHDPxZoFLnM5MXlRCNp2FZIWBfr1wF2yyZVUyETStQLx893ej4cQw
+HOUTkeXe3mSLmZA0wwZHMDgfAnAFyO+8yqMijKGdAQKBgGOEJv3AT0d97AwesKxa
+leYD5Z3sTy/f7YEyFOclIkOs9+h8FsTJYe7cGc/tn4Ls07crsZVkGY/q3Ut+mgLf
+86VNn2hPWNZATkwlJEJ4TH/psyPCUI1t9mfhg0cxCu4/szGRUW4sbgQAAAdO5/Cg
+vqadrtDib0WHd6HUWBx429Eb
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/0444_key-certbot.pem b/letsencrypt/keys/0444_key-certbot.pem
new file mode 100644 (file)
index 0000000..25013f2
--- /dev/null
+++ b/letsencrypt/keys/0444_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQD3t544s3wiEm6k
+BMg/9lD2J5sov/InykUhR4tbz/ibuybZTXCeU1XASguZ7hnWb6otTIiDFpY72K9u
+Ry0OREmtxN0ZhNqu1tjXmZdZbKbW9lZYjzFu85ouUm0yENKPecprq+YphNhYM+M1
+mmIamsWpc34BB5TjoPUPr9qz6GkdO1JCv5zqF8v6aZl9cecE/1yFAB+fjZIpyxG3
+m890U9kMUs+w0C7p+a9jH9s8BekpemeYHUL5sdhmLMwLEMbBMZznxAlknSIdEb0A
+uj+wIx5CrNqjW5uTSL7YhJ3tN2fL+AEUKFAsyKtQ/wUWAEYU3b53oG5wT+N0Ej5H
+TANspM8fAgMBAAECggEBAPASGdrlx5XVuzhmEhQ7CTemJq8VZv+8/cZE6gAuy8dR
+V1Mdw9kM9nwGxruFj7DMQ2bnVx2EFFEnrMz5WecLs0QfGBAVO0JaoYhBJ/bYX9DQ
+p9nn3Iaku3XNGFp/BzFZXR2AWO0/+9NvZfGbDxythoa0kRc6W8dHRHjReukEgmp6
+HRUxvbkTzH2Yysz4WJV22b3Nyqw563ufBbYExT9CEtqLm1JRVRCGk78p4G9F4nsa
+mjZsBfOQpAeu1giI3BYFQDmCh1hZY+TSo5bIPrqd2kr2ztRYi0v9isr9koAav3qr
+HcMroYifHVGkuGwdgBb6smz2lA8ZRmHgxOVRKjWC1gECgYEA/0Y+Ml0s2T8dMMYo
+xShRAO9adYSd+V7POszK3DM93IqbLKsDNza+UAkG2oAhdNJ2DGZ3GlxWveCOmYOS
+hSYaTNEgTqoTIqJbKEmvjac1FyJD8UDlifDbsNxC6207zQlWu+pDeMxRcArjPJaI
+b8sUzkPm380O1xaViZFoTmHxO58CgYEA+GvgPqExkv/D6CorY2BUwKMmy48m7iF6
+ghGa1pakbXU8mVl5MqshwLlyffXVysa9t/NBGgy6K8/btrIHU6CNGjI2xUTqNzSm
+qpqBeKr1NvuU7T3E4oO3qoQSDKp5/WyAZRGboGPnwA4de91ZbejgvMXav8e5yIBQ
+o+LrT5KTvIECgYEAo7U7e/cPJP95y+a5DL9vO2dEnur+mIb55R6i1hayjHYDT+EY
+PdeIszEmyQe07QNvm0I3DZu8MScKrF6Zn3QxF6Rh0LD3dpWiWjLvN6vMu1pJMjXJ
+Pu5NJZ4L+Ilj+XkMu5Rf0t9NNsp0sk1jkDYv0JvxOwN5iey81619tA7RsscCgYEA
+qEQxrVp0ANT7drtxjiuG3MDmG0WIog3NNGMGVUnOcFHTzS9ct6RRBYDXe1hUCrjZ
+csrzEtkCFYECmto1ukBqsw7GKJLIbsJcDfz/q6No22hHdPa88I01j+tLaobigHTI
+9yyZFGf3ZxBoiijhVWBDMbp2tCZtwdCgTpH6v3hSV4ECgYEA/JAjbhLb5HvykCzd
+W+OSKH9XD16w5gT83KJcHwKtUIhXz2RrRrJFZipplTml8Ad/X86iQdkpp21C8u6M
+COL1RkX13yLXn1FUy4Y4o4FQV9Rzw0OolEW47KVAukaVBXFkTzexpnDZ+iNz8JeZ
+tkwayiKSlO80XypqXqpexDUVRh0=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/0445_key-certbot.pem b/letsencrypt/keys/0445_key-certbot.pem
new file mode 100644 (file)
index 0000000..13fe8c2
--- /dev/null
+++ b/letsencrypt/keys/0445_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCopMFqc/XGkeBg
+5xVEn8dXsM92XmtiKPuIWLR8iDwonbMvEe33W/TnNes1jTS2G3fCo+pnC67J/0Yk
+OjiPo0IaM8XFnGsIuSSLMtfPwrCQn0CtYZaFT7mSjsOhJRfIOpD1x4BIeVaW1jW3
+brSPwIDXcz0Tv8RuVdidEkyM/DQpOnY+JbyE6VUh18acgg3GGCY3Hb9cg3CwoINb
+NEWar+VzKbDJMAAP2R6ZakQQFfJ15ogAp7p8uIFgeX/PouiUohXZS38It71VuO8G
+zlcG3r38WBblpamMLYCWWcRbxiHQVu6SqMTwj6sLNb+mNJ/cuLugh4uTB8jQMk5e
+uo9G54ZbAgMBAAECggEBAJ5wIzKi/R3wQRBpKccOIZcWCuMXM+XFwQLI69Avoe06
+s3QecSY6o2xxcKggIIySY8Jeg0MKa81k4f35INh5tgmt6DmOidRpNJb+TljnfUBy
+Da6Wh3Z5f0vcipijo6M+up/eLXxpWttdJpxOCp8faSyBHLmoKaDLUDXJUlgGPe8Y
+cUUhVekYpwWyh+oytx7aUYK8pEGVsTI+93H4lVijtBWkl2Yc9yK0F/F+naE00d5W
+C71rRgslqbA+moaHazvtnf6+8UFblkYgxJyrLzI2fDgMHHIPdQyKXZZub9MnL0uf
+B5O6MBavrt0SBtpWKkiwWZe7sh0K4FHbcUk/gRjlCZkCgYEA3xCgpjL+OXgyVkhZ
+ZPGPmsflGyh9MnTWYqggxjQONlu55SSh1D3SX8P2j8e6Pv4sKlkxxZ9y1GJ1u2Q6
+7+lB4OaF3h+ao+8LeQUvriyiKv4BZEWBtCuaKchjwIbL/8XNJDXz/Leidg0xG0My
+j9vaQQ/QnE6YUkSqZ+NSwsnAb6cCgYEAwYseJv7BgB0cOYFORygsjlLrIKdSCEx+
+s8xze7ypEtGzAZQ69cZHlFrxtcWaDzedc8FNK7MotYMQKrJfKXbFnJ0APsf0swum
+kYM08aIWOqm3vBE0Nw3L0GAWOoI8nlbmKd0arqo2BCF8ESYwCoL0qeOYUkYj4HuX
+QSX66sB5qi0CgYAVFslZbTDD1i1MIwLwnDXreEKc0rMjdhBeu259zqYZVYq5s0Dp
+g/7Dtw80gLmHAxjB2DTwbia5FaXz1YIM9IyZ6rF1Up+YKB15j5f2a5nZXrJa/IdK
+tWSZ1qw3o4bd46GFbuRmXCYr6wtdfHjnSO3VgN1EKdoUzREfSUqlx9U9uQKBgFVn
+RQPiEJKuxcCeTWNa1+ZpsnVzP+CHmLVQN3lXc6fpPrsopKfFOdq+EsCqFGQ4n1Lv
+7lSlNwZ5cg3VLebHEUYdhXkulMzZDERTiG5Dntl+AKSNVuQgQ1qMu+JPi9427FN2
+zIpcc395Ix0SI8rPpJS+6H0NlFE/WCwYTVN/YXB1AoGAJzFYNEtwZ0uKyfCwXlyH
+sPCrkcYYPLyiO0fWFKfAQSos1JP+Dw4ajFN9/keGxMpt2qye6TpLq8/69UFUarRr
+gPAdxPxmbfJ1fLU4IoAPComcEtMrbiRzui7sYPMO6NgZLu21XkyjHwe/EY9gZ73h
+znaDS45SyP/BRAS+KerEHxY=
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index e356acf0a1bb59af5ffde3cbcfa56f539b17b52f..d8e517f32ef9ca0a487171a1c17478e315344731 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA80xZRE7KTFR3XxhylwPTDnc0FekX3Ft3t5gRadSgbSS7gVnzEvto
-xSoGk0WL33fQaACBWL6fQdE4bhIlJU9jIvcc4khIhfMtyagVg0J3bPvy1Iag6R6Z
-Z/URoAMWX1pmXmTC3PTo1+cI5fkjK8kBgjHS4RdmHYWPtCovi83A/ymVJjrh9JBw
-X6+XAft5dzOxQtL8LQlGa1rrreIw7zGFsPc3142WoO0Jd6ZTrsjeQYSsAxC6j/0E
-vAkqkGEPlcab9Ggcr1UOw6pjLx6/Yon0Se4vgDvoj61A43imoPoxGW/q5liWpE6A
-P34JbMjsYb889CBThrh7Cjutrdta+Vey0wIBAg==
+MIIBCAKCAQEAx1iPURXdmqrlPQIf6wrF7cbUI4MUA1KrKBwAPRebT8RBlLAwhK4O
+zhZ2Qlr0dH5zcIy1CzadeLYOKLY1M/iv+IR2lgRTxrP6NNuMPZuZHwGjbm/id4dY
+D164lZe0CBpKo6q4YmdgxlfCHVU+3/2s5rmmHQGyTP4Ox8hirEKTHFJTsr/sbglO
+zUUQtjACDS+aKZe58QPTUREftPe3pG7rV2TvZt2myozFSHlAf7PLPsVnICvxuWiM
+jsZLH3MDLYz3gyrDWBbC2t4yQFUXwgYsrR/eDLyWvMfb6aAmsBwuZCWJzRf4SOIN
+nzUCttURYi6CWgLCdsSbwdeA7Foo83cTKwIBAg==
 -----END DH PARAMETERS-----

diff --git a/postfix-policyd-spf-python/policyd-spf.conf b/postfix-policyd-spf-python/policyd-spf.conf
index 4f53d9cff4e8f559db6d271c6ef5917054745b5f..0f3b1baaeb166a31c5ea2722dd681306979647db 100644 (file)
--- a/postfix-policyd-spf-python/policyd-spf.conf
+++ b/postfix-policyd-spf-python/policyd-spf.conf
@@ -1,6 +1,6 @@
 #  For a fully commented sample config file see policyd-spf.conf.commented
 
-debugLevel = 1 
+debugLevel = 5 
 TestOnly = 1
 
 HELO_reject = Fail

diff --git a/postfix-policyd-spf-python/policyd-spf.conf.orig b/postfix-policyd-spf-python/policyd-spf.conf.orig
new file mode 100644 (file)
index 0000000..4f53d9c
--- /dev/null
+++ b/postfix-policyd-spf-python/policyd-spf.conf.orig
@@ -0,0 +1,13 @@
+#  For a fully commented sample config file see policyd-spf.conf.commented
+
+debugLevel = 1 
+TestOnly = 1
+
+HELO_reject = Fail
+Mail_From_reject = Fail
+
+PermError_reject = False
+TempError_Defer = False
+
+skip_addresses = 127.0.0.0/8,::ffff:127.0.0.0/104,::1
+

diff --git a/postfix/main.cf b/postfix/main.cf
index 24effd709853e7478fb1897745330b00124e2c16..d2af21961036b35732e124273317f95e91e3581a 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
+smtpd_recipient_restrictions = check_recipient_access mysql:/etc/postfix/sql/recipient-access.cf, check_policy_service unix:private/policyd-spf
 
 
 ### Bedingungen, die SMTP-Clients erfüllen müssen (sendende Server)
@@ -159,3 +159,5 @@ append_dot_mydomain = no
 ### Trenn-Zeichen für "Address Tagging"
 recipient_delimiter = +
 compatibility_level = 2
+# SPF
+policy-spf_time_limit = 3600s

diff --git a/postfix/master.cf b/postfix/master.cf
index b89efd33f470db30b70de6a0b0d8c13834285cca..108b8f709ec51fe49f5358b7783a092e91112f7e 100644 (file)
--- a/postfix/master.cf
+++ b/postfix/master.cf
@@ -67,3 +67,5 @@ anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
 submission-header-cleanup unix n - n    -       0       cleanup
     -o header_checks=regexp:/etc/postfix/submission_header_cleanup
+policy-spf unix - n n - - spawn
+ user=nobody argv=/usr/bin/policyd-spf