daily autocommit

diff --git a/.etckeeper b/.etckeeper
index f10bff97d92fb6c106c86d821b2a07b9624dc01e..a314aa7483f97cb97629c71aafa5ee038ee28ddb 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -10703,6 +10703,10 @@ maybe chmod 0644 'letsencrypt/csr/8013_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8014_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8015_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/8016_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8017_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8018_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8019_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/8020_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'
@@ -18721,6 +18725,10 @@ maybe chmod 0600 'letsencrypt/keys/8013_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8014_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8015_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/8016_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8017_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8018_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8019_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/8020_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/dovecot/dovecot.conf b/dovecot/dovecot.conf
index 497c125b7968df3b9cce80413598dd5d136213ef..830f1d5ed76bd3440f31e55e33c75fb0416f0d36 100644 (file)
--- a/dovecot/dovecot.conf
+++ b/dovecot/dovecot.conf
@@ -119,7 +119,8 @@ mail_gid = vmail
 mail_privileged_group = vmail
 
 #/var/vmail/mailboxes/%d/%n -> /var/vmail/mailboxes/hoellein.online/mario
-mail_home = /var/vmail/mailboxes/%d/%n
+#mail_home = /var/vmail/mailboxes/%d/%n
+mail_home = /var/vmail/%d/%n
 mail_location = maildir:~/mail:LAYOUT=fs
 #mail_location = auto: 
 
@@ -192,11 +193,12 @@ namespace {
 ############################
 
 plugin {
-    sieve_before = /var/vmail/sieve/global/spam-global.sieve   
+    sieve_before = /var/vmail/sieve.d/  
+#    sieve = /var/vmail/sieve/%d/%n/active-script.sieve
+    sieve_dir = ~/sieve/
 #    sieve = /var/vmail/sieve/%d/%n/active-script.sieve
-    sieve_dir = /var/vmail/mailboxes/%d/%n/sieve/scripts/
-    sieve = /var/vmail/sieve/%d/%n/active-script.sieve
 #/var/vmail/sieve/hoellein.online/mario
+    sieve_after=/var/vmail/%d/%n/sieve/%n.sieve
 
     quota = maildir:User quota
     quota_exceeded_message = Benutzer %u hat das Speichervolumen überschritten. / User %u has exhausted allowed storage space.

diff --git a/letsencrypt/csr/8017_csr-certbot.pem b/letsencrypt/csr/8017_csr-certbot.pem
new file mode 100644 (file)
index 0000000..0e9983b
--- /dev/null
+++ b/letsencrypt/csr/8017_csr-certbot.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEfDCCAmQCAQAwADCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALls
+Ch6GTGaGWlHxGSgE2rPlPkRbS7GwhL0EnwiOQfj2uV9vpt0x7b8JTcZ9QYZzmgjv
+kHxseBGcxh2NflQkQw07OWtOivvV9SldCOJJ4z9OZYb3MbpIRH8IfodfbUwnUDTO
+1hMRrG4eayT69nJhYh2Ma8+rjkDQ0XCcQypOAckt7Zh3xdFTSrvC0d2oooRbB93D
+dZrrfiV6Z6obkAHf5IWR96wPrqzfMf8BTI/IsGICZ77rl/Q7Hq6khFt9xSGAL3eM
+WsRkOl1tgaLnioYuQ2UwiwXDxxmpWWfUWyvdI5CTR6kx0rtBSJFz/+UTPV1krp3G
+yZjDQerzkIRx5o9pHysPbf2hBM5qCSp1Ytyp/AKFAZmuCxQG2b1yC2WKTA/DqjZq
+Z8CMvzQ6l0027E0ft5spPaP+3JtzeD/Fmba03+Bwu2Y+ZyCk0SB1hEXIxsjt7GYL
+fSlPjSc19l5uAu7VLK/CG/9pK5uxcFFzQMVgOn/Ih3f+Ex8uuP5o3CogrT7i+AYn
+SaQM/50cMZOuKFi1oe/b6ot0MrdaZ2fdPPcuMLSQq49EU1+BBx0Wuk3iONx9qE6m
+aNt7dFI40nZ9h26MbsdKJEoedKmLaqSXbNY/UXywAkUU2bdgVkYwrj08cCdZbuUy
+lIQwfZUnAZD+w+/AsglZc75n4lH2dSTtXgOCH0RBAgMBAAGgNzA1BgkqhkiG9w0B
+CQ4xKDAmMCQGA1UdEQQdMBuCGWNvbGxhYm9yYS5ob2VsbGVpbi5vbmxpbmUwDQYJ
+KoZIhvcNAQELBQADggIBALNDUPHmol6AJmDbZb6FEwNojF6hscLncfS6UfrDl0w9
+6OfTW+lO6AxtixR9LU2MbAubm6TDjSri1xAThXxwu9wDhJsdGOxXjRqPC2c11ZMc
+lbOK7/TbeSVLbn7uHJNQpWwhzpMLdybdU4eXcM/ZLlqHX/kfGGbSho4Rb9RU4Cp5
+0dG+mY13zO8U5V/ybdA2Xls3jG81Ka2fiedmWQH5EPhFw6S1trXSwVB6wfSrjvRx
+gVELTOmKWskhRp0wC8X9UKRBb5BGlmjA6UB7EBLBiw5NwlGIW6zqoP3pIlyQnXhj
+8kIDFmk/UXYsKX5h/ceImOP9hL9wLEpNcw0Kkym0HSrzDbhQot1jUxHfwdZyEr3/
+Olt7Qap8BfYRGHy6ipUwp1f35OAredWy95kn8F45dOheTjKFwij5zvi9c2MapZNt
+tLVBYdU3Nk5lDVrlxq2caN9sK/EB3o1lXTtft6BLRNgiY5TQPQOnZYhVrLksP1Cd
+QqAzdszJM4s2quv3qL9NFixQe142cqrbM+pppC9sYWEc5z1igHLcJwGVX0M5pXv4
+LFPg+CP+psaOo7Vwamd4mNWvthbze2XJsIvnFyMkekly3Gt/55hqnN5jTF7PkwBJ
+uyMxgeXs5gTxgTNy3924oDFKl7E952LnJTi3Gv4KKHxHo36/WG/GIaissKl3H+N+
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/8018_csr-certbot.pem b/letsencrypt/csr/8018_csr-certbot.pem
new file mode 100644 (file)
index 0000000..b4b9cc2
--- /dev/null
+++ b/letsencrypt/csr/8018_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIChzCCAW8CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO6O
+3woHkb14+yKrtZulcmN2sJLm+Z3NQI7d2wqggSzvdu/hqzgq9Zh/6H+JiqFuQd4+
+Z6z2Z4z6aSL2/WSYcrybD8825xPXLIacMxCtbyDSf9Drofm31Th9ecEemGfwR+Bg
+XXzwTO3c3k8Co0cVPjRjbxyaRc2+JdK5di97jOqdOQjqEkASYrwdFWh70ooRcwSl
+sSgXYhVGLJhPrsGe8EMgDH75GGhsxtml1B7UjBHpqkF48Yu0/5zHCUCfwwQeq70C
+DvM7a1wY1CGxN+6Dk9KV6WZfVH60cOrBkuhFJZUilqZ01VJ13EVvKhQJSx123W6j
+mzffciQ7iPoaKV/fRJ0CAwEAAaBCMEAGCSqGSIb3DQEJDjEzMDEwLwYDVR0RBCgw
+JoIPaG9lbGxlaW4ub25saW5lghN3d3cuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3
+DQEBCwUAA4IBAQCWoJtccFHlJ2lnU0OkYOsMV+Jrmbp8ZtEfjpgyOu/zJwXvgrfq
+NCYQy4d517vyEklMHsuVXLX/80ir24wZr09CL+jbFnztQA1mRlIPnDrYdUOEHBHb
+1KeqcJlfL0K8RDuXdDSmDPnjIxfmn/5MEX2z36BQIk0hLJXcWYcGsjFXPx7SXFq5
+dahSqM4iWZDPL8G++1538PDwUWXf1+tQF1lRqyAwIXn1dDS41sI8AbexQMqw3uL1
+iG2rOre8Isp9GenwhpH7OXuc/yAvA+4h+MX6jtwa+GdKUUT8dnFB5XEDi5zqBnRC
+3u/EI7aaNsc6b9LP8AfcopiJIGoPVD0kXjzd
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/8019_csr-certbot.pem b/letsencrypt/csr/8019_csr-certbot.pem
new file mode 100644 (file)
index 0000000..212ad92
--- /dev/null
+++ b/letsencrypt/csr/8019_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV6
+PpbQZ/K8TFTtW0kC+Lz06MHRtO7HG9D2ibmsRfhVtJpBRLQXFvKqHm1f7C7hMgXE
+R06YHxJL6mpzUpf/JOhNJoH4N7x8YcD3NQTDk/x8kd81mp+5H5CDv1MHdgfRt2oW
+ByeOxxf/1/4v/meMsdZeBXBPUVi0USDvPMzBicff2wjT6nwtkXOq7YVEyRnKGrZ1
+mKaGQA/sgh0olNOoXibjPKajHs0x878pcjttFJAeqqNNy2+VHku7gmpEtQIfB3vQ
+4E4p/G1muo+kkZjNtffH7hcqpu5dV6YmHu2hq8ip//nZQgU7zZKFTZWnmyBTBBFT
+BjB3yoVHg+fBs1VO0SUCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAgJdWmU2FadgM
+5ApJWgl0Hk8kET3fzqao/T1gwFPcFS2XvJJaXiMP+GE6y8f3kslRMZSeaCj1N6LN
+Xn3y/3CaKyhwi4btSZ/tp3pH6wySp/a1xc4nNYuuph1t0yki0stwbcPcJ+hFyFly
+ojLdjXayAkrZ98yy1i8b9T8wv3VQquHVQKl4sLgXcJ1Zkt4z+1zgrvLZosegMY1H
+CzAIOKIq7KJ9k8caSniBXBapvbey37/xLcwqBqkjvT8KKidbmAb02e2wq1MgsCk/
+Mn48J/lp5FjY9Fx6J4cLwTdB827ahnngfb1F3P0xDW3TyUJZYBlPhrmRqEMd6ATd
+3z61uY8jxg==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/8020_csr-certbot.pem b/letsencrypt/csr/8020_csr-certbot.pem
new file mode 100644 (file)
index 0000000..15464a8
--- /dev/null
+++ b/letsencrypt/csr/8020_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdjCCAV4CAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNJ
+0xxZp+h7ANk3WWd3ObRKxZLNpU6YcZpSd7Z3rzm1JutehFPUqSCNYF2M6dA/pxVF
+pE618KlBJkOv4LsccCIpwauKclSrp67OMug67+wnbnb+7h1yogRJoFFeRgGMov/d
+vep6fBTIi9j79KV/WGglwnCRZjmWVw4fAfnXvEMmRGkGn+9HqqYy2BWuF/focJxs
+AKAc5BwTiayKlup/Sb1ZxURVHAhK4mkd+o9fdNweVOlf/n136lEV+iNgQOxIY1JJ
+7iabIFiK9PTwMpzLBO/5DTXiLrydi9ONrrs1gCIU+0XSzphVbl5X682+4Nk9Bohi
+sQkTh80w6xpbKqpTPacCAwEAAaAxMC8GCSqGSIb3DQEJDjEiMCAwHgYDVR0RBBcw
+FYITd3d3LmhvZWxsZWluLm9ubGluZTANBgkqhkiG9w0BAQsFAAOCAQEAV7ZwqBUz
+5aagbU1Tk8tOYfGtzTnre3CKwZkOXtujvfpK9GBRGYvbQUctcdp6/5trETQVk6MV
+QPrUPtRwM1gyFe98l4XfQBhBaH1C/qj9JmVN5dkGbOLQARpWYhjzNc8q8FbAWBRY
+5w3x+M4Cs7W8LXGDlN38D+5uNxxSHnOmawX77KLRDC5BBAmJeBu4Yi4V5joMkE/B
+HA1FlUEjqb6s25MOLl1tZaEQRPzrf6lfdBn/6JDWmPz3j6gAUBv61vWJXp1mluwd
+DZoafqeGlv63FggJncsbVNn70y/eO2HKgXGuDBQ9XdWBkpMuRIlMmcHazlSgEiHL
+gqhzWhkR/UL/wA==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/8017_key-certbot.pem b/letsencrypt/keys/8017_key-certbot.pem
new file mode 100644 (file)
index 0000000..59e0f51
--- /dev/null
+++ b/letsencrypt/keys/8017_key-certbot.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC5bAoehkxmhlpR
+8RkoBNqz5T5EW0uxsIS9BJ8IjkH49rlfb6bdMe2/CU3GfUGGc5oI75B8bHgRnMYd
+jX5UJEMNOzlrTor71fUpXQjiSeM/TmWG9zG6SER/CH6HX21MJ1A0ztYTEaxuHmsk
++vZyYWIdjGvPq45A0NFwnEMqTgHJLe2Yd8XRU0q7wtHdqKKEWwfdw3Wa634lemeq
+G5AB3+SFkfesD66s3zH/AUyPyLBiAme+65f0Ox6upIRbfcUhgC93jFrEZDpdbYGi
+54qGLkNlMIsFw8cZqVln1Fsr3SOQk0epMdK7QUiRc//lEz1dZK6dxsmYw0Hq85CE
+ceaPaR8rD239oQTOagkqdWLcqfwChQGZrgsUBtm9cgtlikwPw6o2amfAjL80OpdN
+NuxNH7ebKT2j/tybc3g/xZm2tN/gcLtmPmcgpNEgdYRFyMbI7exmC30pT40nNfZe
+bgLu1Syvwhv/aSubsXBRc0DFYDp/yId3/hMfLrj+aNwqIK0+4vgGJ0mkDP+dHDGT
+rihYtaHv2+qLdDK3Wmdn3Tz3LjC0kKuPRFNfgQcdFrpN4jjcfahOpmjbe3RSONJ2
+fYdujG7HSiRKHnSpi2qkl2zWP1F8sAJFFNm3YFZGMK49PHAnWW7lMpSEMH2VJwGQ
+/sPvwLIJWXO+Z+JR9nUk7V4Dgh9EQQIDAQABAoICAQCGBcuCqLvMV0wtckEmpeuW
+oBpTulGKC/bF0PNKcdjJpTvz+XX457/al1T6JUsZbbFmyBH9fUGEKXchoUYwd01n
+4Ojt4QWgZdQgo7hqJ9HzziygU0hERzwLPg6Gtrj/lGLq6J3fhqTFq4LyZduAbVdH
+2FmM74mQ296msKvzhhLQYTwdOmVnmfaopHag6uUdGdcjucXlxlWVrVYEpIuAb150
+FT+ZxHQTS/iNQ1kdjIfBL8/hNdTNmXXh8dQhdVTplAe7N13cGj39jctn/kgoGIRq
+PZ4e+pWMvNV8sQd9Owgb1fi0GOkipFtZlyjdYPy35rA4JplMq8WXl5lbwiBOhEMb
+1tXNuOf+/v+8J8AAVA8oYPPZzzct96wqKofhWkAHUBYkRVQh5VUV2xsMtj+PHLWX
+/KI+eX07SJmZ8HZipKeuwjcLNVuUb0abUDTgigqYS28qyozHZE4F7T3gD9ac5Gmo
+NQ2wvevrPFey0276G77tQn+hAMbWNjB/K5UbJbEgC5YzNea71iCtcg4k6MTzZhhG
+q3ToXp9eP6P8IGURZ/V18cmI2OK8/rJlYUgutT4VKVvfccjTozPjs2DMfbS4Hz99
+L7kBzDMgJJMVxZqK3XlS0dDTQMU2aObm37dBWuN0jhDA7xz3I2iFRP+ePmblsivy
+njBmbEcNkknD8N985M6FgQKCAQEA60OunBBMyydgSPehTYqRfOk513uCiaaPKhjP
+C9aLtWVrTgpmF2kmE3l8D+bhAssl1llErzajRreDswIBLRnDxsFyF+N3VywsSzCp
+q2hHEuwV+lD2L1cWqhaVkpbRym/UijIkmwtwiG3hyZUy4jNXr+d+TAT/h+Yvab35
+UjwCM3LFhbRLjb5tBD/lM3VdcLoTmIycmwODGUXBY6BFqYsY3PdLj/P9wP44KZo2
+XlIKq5ICEJ269HO3YxuJKeC9NlQaq8qlevm22Swr9hKtyfXh4/ub4VNpzvfv8JZG
+uu6wzWFrOld2mrXU0R6kbfHR5/1lTjPRUrE+rICfPvsLcFlZeQKCAQEAycPBHD++
+ugdwvxyDUCrcBk+BKnZKpTZew6wuhqqDLfvgjAaADaUG2yNwPHP5tAis9D2UdUY+
+s41TjcaRo/Mvy62uWMfPa5xbmTtcvUZ02kerYQoIxavaz3M9AdJFjr1DgY10Jdrb
+qXxGP8p57nEeNaFUQgwY27z6k3wwQDjkw+StOVMaBOY5wJ0GIauIlcQcyqCMAcWW
+2uy7pZtuDnu/TzAKUeBvsjmIPrBadJ/6c/M12IjfuCEyzoNs1Q4cEhweyxXrYnvM
+0GHjjipT6Juv1cQ0TyjV1JGf5XahCACutfYHAAVrkvNGCiKtSBsKjClbmrz9AAVH
+rm9RD9QdLGtXCQKCAQA35Y3P8KN+RS3ASG2fscOdbQBcLTE3qUYsl1ZiFqh9Acq7
+8QaOm2H7kIqkcJOXiVLFGdKS2qVygNmep2RGJe/5Ai8sc9P/9zPS7Y3ydsUkPsl9
+/sxvNP7ijJkfCgxwT5+s8fr2h4JGN+1Eatl7Gv3Dgnnkb++Sh2NOeV+KZU2UkblS
+aiLlW5AlSVUYo9L+nIdZYFc5EV2NnKA1HnhOrwjKP0tJuYvZ1czcPZKbWFzGpNsu
+vXsU54Vz26/8LjRmexcXJ/+nNzt1X+RWA9wctvnjo/1GTP4/uXLds6a8dUe2lGXY
+p707RuZ4hRJGOQVJXFA8g11Bi3E7pRew7A6ss93pAoIBAA7hCb+sj8MmQ1FEqAZk
+cr9gY5UfDhgq70gczX2O24ermH6bCBx5fAzzCxbaMqLtNNv6IpWXbY5OMMg2yYy+
+pVqu3zma2pgD+tlNAGTQ6lMij+fjFoyFROihhfE5cXm6SV0nclZMUoCoMoIHy4Aj
+BWhNEmqge8DQqeXwdZp215/+oCunDjcoR0AGFGqtPLBWuwzSVCDZUmuoo5nt4Wre
+A1iyoUAyfeo1xe9hj/ojxhOA7wqd5WmtwRJrrL31gWpwenDdl/M2T/9aCK72PiPc
+P1ZTVswzpbk8V/9TBUMS0c+HajK9M5atrA+ZSRAVNmzpq+C4aSv0N7oMaXzyVoht
+DgkCggEAQVGkRAziHV4r35Yg2wdJL6Km01/ajdyr8XMNdj89U6UXq6xGeTNQYTQH
+BRyReaDhhQWhmcQeEASDAw9OD0yCWso7FUEzyWOf6fckOJIULVHL3vgn+mojRsDl
+q28IhAc5Niy9qHIZGjQq3lNEf/IEidtf5wXbiHHllXUQItIHDZM+8gPfIa0O2UAS
+zX9T3u2xS8itJattn3mNaANx45CH2Tne/PnMmk2DKzuWQzL5CfsOWX1hAy9Pr1ge
+dWyoObOt+tGq4LrXULMCv6xwn8r75ixWHjUTqI3uJfD0qBXHkSm///rebmmBFtOl
+w+td+pVglLdTjS/kMHC0/VsPAe63gQ==
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/8018_key-certbot.pem b/letsencrypt/keys/8018_key-certbot.pem
new file mode 100644 (file)
index 0000000..ea0b127
--- /dev/null
+++ b/letsencrypt/keys/8018_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDujt8KB5G9ePsi
+q7WbpXJjdrCS5vmdzUCO3dsKoIEs73bv4as4KvWYf+h/iYqhbkHePmes9meM+mki
+9v1kmHK8mw/PNucT1yyGnDMQrW8g0n/Q66H5t9U4fXnBHphn8EfgYF188Ezt3N5P
+AqNHFT40Y28cmkXNviXSuXYve4zqnTkI6hJAEmK8HRVoe9KKEXMEpbEoF2IVRiyY
+T67BnvBDIAx++RhobMbZpdQe1IwR6apBePGLtP+cxwlAn8MEHqu9Ag7zO2tcGNQh
+sTfug5PSlelmX1R+tHDqwZLoRSWVIpamdNVSddxFbyoUCUsddt1uo5s333IkO4j6
+Gilf30SdAgMBAAECggEBAM9QxjA3J8abbtRQmQDspR4fNZBUvjUO/L2rvAHePqRI
+bvpFCcFERC8FaY38f8eOxBtZ7Et5z7/KlrfWIZvciEm0D+cqdWLeqklJUW966YqC
+pKVxQVB9HAV9tePIrPYW8L/jvxsm0hQcz+2mAzNxGJ/6kcMvpt4IE2Kv3i+hlXMF
+BdZMCEhKRFCra3uTUExThUkVKD+Y24wJpMN91IwbNtjIzBlyuwy8+p53AkIt6YoC
+FtYPQxIpFaAv982paQXB8Jbu2KRm91kvHyavorh6HUoNznoEdy1F37/NH8RgekoU
+niOirFY7X1fPTr/JyEwkeoMKsAeBj9K9ZmRPuNGYbcECgYEA99ZYIt5OkDRtZMIR
+Oyimd1xWIVBXiKFHsIW8hSpPAmNH547mWUEYVDY4WZJVv7et+4Ygm/eJN2XyvyxF
+RljIUNiZmABGxfKEBQYRFDccknCT8X1L19fViViMHuHLfGRlskSjH88ykjtsWZ9M
++0APcKYC23uycz0I5cmLTtPUo9kCgYEA9mpJ861yZA9sUgmx9hIe14i6WooVE2NE
+kua9BLThZXuFTyJnI84I8jRziyNzI84DZzWBe+52hgRoZRhiZ2KpAUB7tFxzoH6P
+qAocLFiViYWzbpECOKejnOLVZm0VK8EisMxKJz8aqqe7iEgbuCnwXL091t+rQlxN
+IANbdFZLoGUCgYBvApBp1d+k0gbp6c9kCzo9Hpvpwh3jMjJ1TAH8N846CJRNkQF2
+myS1m6+z10sXW8PPdO2oTsEkkkKgBMlm0B+xrsNlhUIuKgmeYnBF+MWQhmKN+Yx+
+OswIACSLNKI7rpCqv/m9JsbFH17R6fvGUpRX5dRD0W1GFuGkY5lFjrahSQKBgQCm
+Yoakv00qOy/NBTbhDMM+jdgnIm2wtaqr9plTAD/holIVaQlzp79qq/gIz1sDpiuu
+GPbhk9b8DyXefWSUoo2zhrMAyhxZFpwxvwHe/8GZJmpOEiQJ1UgouxGVI7rT3Ils
+D8VSUs3SxYdfMjFlXQwr0qxa1pRxLpn1L88k8tAF8QKBgQC9i7M/4uoUH91PM0+R
+3DD/ePq6u3oYgFUTaOxDL39UgIJ8j4hEYr+t+YdTRwjK3z7wDBIufIJ1wCu6UO4G
+UHCzi+8dHFH2dx1lA0Y5s8Cg1CCD4hmz5yjDyRK5DZV2BPAThi51ZL2yIgVLUKSX
+3q246fQK2w2ZqNde5dsQgFWAJg==
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/8019_key-certbot.pem b/letsencrypt/keys/8019_key-certbot.pem
new file mode 100644 (file)
index 0000000..8abfa2a
--- /dev/null
+++ b/letsencrypt/keys/8019_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDFej6W0GfyvExU
+7VtJAvi89OjB0bTuxxvQ9om5rEX4VbSaQUS0Fxbyqh5tX+wu4TIFxEdOmB8SS+pq
+c1KX/yToTSaB+De8fGHA9zUEw5P8fJHfNZqfuR+Qg79TB3YH0bdqFgcnjscX/9f+
+L/5njLHWXgVwT1FYtFEg7zzMwYnH39sI0+p8LZFzqu2FRMkZyhq2dZimhkAP7IId
+KJTTqF4m4zymox7NMfO/KXI7bRSQHqqjTctvlR5Lu4JqRLUCHwd70OBOKfxtZrqP
+pJGYzbX3x+4XKqbuXVemJh7toavIqf/52UIFO82ShU2Vp5sgUwQRUwYwd8qFR4Pn
+wbNVTtElAgMBAAECggEABd0dYqkJjSGeOp9ZqI9YB3RWPPsXHkf3QXswl7zPzxHs
+bPAnNBnDaq02fhTtFG9HZvhvDZxiv85VRZfrCexfki5ISG+wZ/5hgLNWda/BAyxH
+wJL85mU+1LG0yqhcDtthUNsal0gcDVBhf4C5UyXQWgcsrisMxU+FYS75ZTMR/kdQ
+BV6Xd7IWFSyRXIXp8txAc+XR+GfIOUsEhtllG/BOGfr/58vZqZRO4sPKXEgTLDYQ
+uAYAbY4Fdu+E6PqQyW0cdN7keWPYAa7neKkt0n1/OUTnjKtwQvK7CA3p5rZJbEXr
+yOm0tkFvm+qiNcUaEYoeQLVUtwCdzVF+avwBBaYMgQKBgQDhZei3sBNrwAGQXmtS
+Nz3SfNwvOcSLYOU/gKpmGF9k/HQ+yT29SfTheM7XNAu6IU5Oov529tbIJbdPhhWa
+5u7EXlL3CkewAYWhXb4+ooklP2mUMFBVvjI6GVpBFfQVne0pbujUCRBge3iBrxNK
+fDWX8UOJtRans08b25MIbk5pVQKBgQDgSei4aoygZ81WsZm7MKnXEhkI1gffKkK+
+0FWrh8s0U5iTurLN/IiFX4XeoxSZRuwgQ9Uwv3WV9PMeCmcshkkCZODspfrYt8vl
+8mf4f285y47q7ZBDMVp6DyvnwhQt53gpDDCtIpA2cxq5bisYQKMbPl9IV/LKKa0x
+ha5FpzCIkQKBgFfVwcmLORY9PZ7H3KSuWE4lUByrM1dpTAziFAUzLEGLS7WH8KJK
+Jr6SuHAOnR9MiVqFlApCCNL4N6Yqx1KU+ajWZRhWDjedcDjA8jkwV6eHPZp89WFk
+e+g+JvjEGFkwMNJ7oQm3+oTOuNg4pJjbLHtojnwkcI6rhoGBoJuheLb9AoGANOma
+ym7wkCMM8Ufi0aNwXfm6CDieEMrihiuWGmplyQlztF5WMnxCJNzdMyHcCTEPIal/
+EQoKDn+EH3Eq1/kyHit4WLvritcJdk0StDA0KDlalRfIceGhy6vqmrlRk2bJFT33
++dBunznWcyqHZihRkmrLhcCh2Ymtf0JfU7VWoNECgYBqjKFOnCiADdE2+YLP3Hwn
+0XalTTrwGySdQtQ2TCXV0rHC+I7Vm0ZZ5R/MhRvuIP3SoHnxKqqhlzanQmr1KTuc
+T+xvs2RfDEHzlg6WAweVbLWAwxNLjfJ3pkVblX3es0UCXMw6UidTYZJ+vosS8GyJ
+BmZfZsNV0cyHarVwkXZACA==
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/8020_key-certbot.pem b/letsencrypt/keys/8020_key-certbot.pem
new file mode 100644 (file)
index 0000000..445031f
--- /dev/null
+++ b/letsencrypt/keys/8020_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDTSdMcWafoewDZ
+N1lndzm0SsWSzaVOmHGaUne2d685tSbrXoRT1KkgjWBdjOnQP6cVRaROtfCpQSZD
+r+C7HHAiKcGrinJUq6euzjLoOu/sJ252/u4dcqIESaBRXkYBjKL/3b3qenwUyIvY
++/Slf1hoJcJwkWY5llcOHwH517xDJkRpBp/vR6qmMtgVrhf36HCcbACgHOQcE4ms
+ipbqf0m9WcVEVRwISuJpHfqPX3TcHlTpX/59d+pRFfojYEDsSGNSSe4mmyBYivT0
+8DKcywTv+Q014i68nYvTja67NYAiFPtF0s6YVW5eV+vNvuDZPQaIYrEJE4fNMOsa
+WyqqUz2nAgMBAAECggEAfqjX1Dvuyw/Jn21tu/ed8PWN4QZEXYxHNcLQHuM6eLae
+wSQk4XgvduMpbItHst4llDvuVnz86wmyHYt2hdRzaBduER5qkVVhrQnRPKPwJbox
+n0YNijuo4jcc0wpXnyAmqonMCp8oePEL3KSVsQxY+/3+xKp1BHqab02pSpPIONvF
+9yAkHKJ8P4HWdbIjij0ofLUoZ7RH6DquPEM7pgU5gYOhWaQxSPmMMHQPv51nA2kq
+qJ5CieQsGIIDCWwX/gEWnE3mDqIKHl/l4FydTXfULTti2GYqK/Oyet5yAZkprbn2
+1yBHWw+KvusDSiZN9WTA/N830KqB0eNIaQx8pZGneQKBgQDqeJ9L5J73UQm4IMd3
+17wa798Ewh1aOF7oMGYdqKwgllqmpGK/QMFQK0BsxDEG9V43gw2eTDL8IYlJ4RqM
+Qczw0e61hzZNuZgm7ga82oGKwKYEoUC5RqJe1dLBZFcRX9V/yw7FUPLoQmqikW/L
+Lb2qN1910D0Qb/aJwrLsF1AU1QKBgQDmsEcKCgeQOu69htbV16TVRi8u4g2kYX1R
+lZJr1raT1iFX5LpI78nqy8/HBUdDyD2b4tbkyDe/kj++BKXwpyo7g/uFy+RaGHEl
+EWtXk1mvbYzHdachdDJTXG4M5ZJL0Do6BIk0jpFlUsZgdUTs3iSU5gx10pCOzoRl
+L02orSc2iwKBgCYrntsvC8X9VlS4WWCkKUZFWIwgwcCHPsQT5PvdErB3aaiJSF4U
+P6Q6dlF+mvCkD0OAPT5Q71fmacAyOi0tJRzrQC4jJe7/UMq9ozEpbT9WX3CPg8bl
+vdcsfhPnrtjwPgSA3RW4OOMgtNVkUcvE1YSZYRv/24EKiRsiLBiNLwdFAoGAXPEA
+bgcEbRORREKjI5yyCEsyj0z7+hJdDxWX3GKxRHatEGBSvTf+vd5HZAO4ZpKyX6/Q
+rHQOIdymWcQ9putylG/kUk+HPNVEII8YFDyFkawtX98C6vOJoxRGMmP7wRevndhd
+/xLBeXUT/6C/mD8XtfXJZ17iZubFaI7aVu8MMWkCgYB2bRAqdjzfGWRezrlPR5ro
+LtQjJO5t0TaWe9AlTBlC9S20oyOWrm6UR/slGcmy4VlG+gnmL191k5TWoMpBUgM1
+/wFwPmbMLdiuh2wBhShijjmzrGRxpHSrtvnUAGYL5IyVaUeeu7mFf2PepuYI1eJJ
+JQctyVnNqexgKinU3Cl+LA==
+-----END PRIVATE KEY-----

diff --git a/postfix/main.cf b/postfix/main.cf
index d56dc91d40df249059e234747cdca04d8bb791b5..a6fb4efea6be1f7a9ab18a15812c545e7d2a9edc 100644 (file)
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -68,7 +68,7 @@ virtual_transport = lmtp:unix:private/dovecot-lmtp
 
 milter_default_action = accept
 milter_protocol = 2
-smtpd_milters = unix:/var/lib/amavis/amavisd-milter.sock,
+smtpd_milters = #unix:/var/lib/amavis/amavisd-milter.sock,
                 unix:/var/run/opendkim/opendkim.sock,
                unix:/var/run/opendmarc/opendmarc.sock
 non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock,