From: mhoellein Date: Wed, 21 Jun 2023 04:26:24 +0000 (+0200) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=f598b7d0f9b32a7d78899e49f18a80c4c4ce72de;p=vserver daily autocommit --- diff --git a/.etckeeper b/.etckeeper index c0b8e5d6f..ee6ccd4fe 100755 --- a/.etckeeper +++ b/.etckeeper @@ -8887,6 +8887,8 @@ maybe chmod 0644 'letsencrypt/csr/6377_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/6378_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/6379_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/6380_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/6381_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/6382_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' @@ -15269,6 +15271,8 @@ maybe chmod 0600 'letsencrypt/keys/6377_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/6378_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/6379_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/6380_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/6381_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/6382_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 2f5ffd188..31e1e3a4c 100644 --- a/dovecot/dovecot.conf +++ b/dovecot/dovecot.conf @@ -36,6 +36,10 @@ service managesieve-login { inet_listener sieve { port = 4190 } + + inet_listener sieve_deprecated { + port = 2000 + } } @@ -83,7 +87,7 @@ protocol lmtp { } protocol lda { - mail_plugins = acl quota + mail_plugins = $mail_plugins acl quota } @@ -117,6 +121,7 @@ mail_privileged_group = vmail #/var/vmail/mailboxes/%d/%n -> /var/vmail/mailboxes/hoellein.online/mario mail_home = /var/vmail/mailboxes/%d/%n mail_location = maildir:~/mail:LAYOUT=fs +#mail_location = auto: @@ -129,7 +134,8 @@ namespace inbox { separator = / inbox = yes list = yes - #prefix = INBOX/ +# prefix = INBOX/ + subscriptions = yes mailbox Spam { auto = subscribe @@ -157,6 +163,8 @@ namespace { separator = / hidden = no ignore_on_failure = no + inbox = no + subscriptions = yes # Mailboxes are visible under "shared/user@domain/" # %%n, %%d and %%u are expanded to the destination user. diff --git a/fail2ban/jail.d/apache.conf b/fail2ban/jail.d/apache.conf index 4cdf95c14..88bbe95ee 100644 --- a/fail2ban/jail.d/apache.conf +++ b/fail2ban/jail.d/apache.conf @@ -3,15 +3,20 @@ enabled = true [apache-overflows] enabled = true +maxretry=10 [apache-nohome] enabled = true +maxretry=10 [apache-botsearch] enabled = true +maxretry=2 [apache-fakegooglebot] enabled = true +maxretry=10 [apache-modsecurity] enabled = true +maxretry=10 diff --git a/letsencrypt/csr/6381_csr-certbot.pem b/letsencrypt/csr/6381_csr-certbot.pem new file mode 100644 index 000000000..5db85cf6b --- /dev/null +++ b/letsencrypt/csr/6381_csr-certbot.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEfDCCAmQCAQAwADCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKM5 +g13sMHR36O186fZQKH3+X7nKgDN3gb4SL/FFZOdqZoxy+ZySqe1vk9y2IFtx7UVm +zriuwk9rlrYgOQ4K8Dno9mx4mmQ3MHMwQzgHA1TpmWInYo4o8A1ceSWUhrMhXLpQ +CwzGei9CR520UISPX1js+5LrXeMvy7SBerFtQZ3YLSfqtKZsS7t27B+G0qJvYkxM +5BbFPj5hU7p9ghHRV+mP5bNUbh7Ynrbf3J1P9NdRZJBpHfDylN1suwG/6hRPbQ2R +bm9QorqAHjkmLSnsLtQPbjXToat4Z8ksL7V0H5Ux0fu6NV836W/10QT8l3dWCMVb +vfBaeVcirwstxyEZAyiLeJR6UvqSCTGmyp6BpdNcZ5epXs4YNwt6htDG/uOZe2Qf +koAWY+oXJtehgqQUhiOdtFdItqEo1FuWFTuGYkZC7lrkwDatPOZzcKsqMmswhWjn +dDsNVzWhohAri/pE0u6wUFlFAg9UrZzA9YT3reeA3QlgVc6vPV9LTjHvdh4DaPIO +/qr2EKbvznxjIVOiNatJmmNbDNAvmImeld9vbl4FUXTn7rhe9gqZu9kB9U1rehnj +WXs7RJqXhtVtnPWe+VhoA3/eG4ngSgiAbzO0SDdiD66bkxEDGfEzYzQapGjka0Ve +eFJ1pitHO76xVr627U/cVPWcYilQc+xHEMCIENV/AgMBAAGgNzA1BgkqhkiG9w0B +CQ4xKDAmMCQGA1UdEQQdMBuCGWNvbGxhYm9yYS5ob2VsbGVpbi5vbmxpbmUwDQYJ +KoZIhvcNAQELBQADggIBAC8DQsdrrU35gDxGsuvDD0/5JpnCxi0OCMhJreqNqoL8 +kTVqb9mLa8s9UHp6DiBNKI0R8YeOvl66joWArHfaVApY8YknqNhEK30nqHMNvQEt +LeaO2EtY+oWlOeEDYkbbqZWc/7JzG6XrYNKuIgTRB8JLd2HQuAWgDYvmGjayV+B/ +oxzBhINpJSHmeEivtXDH4C/R2wp3oWzhYuvFr9ghIf10MCHEsZHRUX4oU5oEScPZ +o73HZ8NpsdPHGj1Oi2ZXX/USLupzY5tYGqVmnAsxxHVj4FSuJMbuvp6aMFfZUjSD +XDlsxHJh9kzvArQmRlF6dx6w2suz77Dthjz6sMx6OHqYBa0rTvg2VoeRJ1P4JQ5G +2tVEHTgzzCW+wmXyVCgRRLIHGxIo0XpFShvFZ3+rAg2DwQquuAuMqx/fAo3FtnaV +XZuc9CJOOf/t4fHsvLE1mIkkGqExaOmuhN8dmem+3sVR2PawYVgF5DL5rIii4faz +HR4N34uRaUZx6XPylsuefy+qpQVHDwxGjujAKBy5aARQZjIYg/j1Hu5wfb4Irpod +mI7qPnbOStnM/KbDJH8WsYXctbMV+UC2jABznTJ18ni3zm7B/bNDvDhLomzAYMAv +7ELLc9plx8lX8sRCScTTkquEazPu22lLJhuUKiu25y7KZf9hzgcPjfhlrrJLSzPN +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/6382_csr-certbot.pem b/letsencrypt/csr/6382_csr-certbot.pem new file mode 100644 index 000000000..8c8ccfa17 --- /dev/null +++ b/letsencrypt/csr/6382_csr-certbot.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICozCCAYsCAQAwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANQq +PGtOJYAWSdzdyKMhflXnpn6ZSiUcmvhkJTNJhEzCZDZXFGTcYYWiALygzo2H7kVD +XLqqLM4UJ0PaLJqqhI//cPKkQPw+aNQ8xwsVOV62kNTIEIODe5yefd167UpiESmA +h+7yH5Q4hlmbMfi6CDqc4044ap+RfSpE6/ErXzS9Y2tHYiWVuKNnJsaXoFnUwvuI +Hz1G2xU95DB9ZrOvOqFcGhGnzZFEI2pTPkyBBGnBZ1U2tWmnFRPQvbXM3zvEJbzI +EYBDt+f9hpkzcz1hzT5Wpk6XctUmqt/0ZwMTPVbgkwgSWD80UjmmBPvSDEpA7KVf +Yd4trly97tR0ic9t7GECAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw +QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy +ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAmYw08Q8gyN3B +NzXcU2NkTAd1kf5UYvrqj3NVpmgEd/+d2O7HR1gZG72ZoIHHZ5ZEoqsxh6grvdEY +HNW5V3FpopjmWGUV3zXZ9ed5RyJD467tg1GCin1lmiRFtBIdQZJvfOPmg7cQ1uH+ +cuNOXDaydDH6HBXAIcaO7Vyz61hptIxvQSFrCvBqQrwHqvhD3hPFVhgrxZY1ji6q +vTu+N4KYEMz6lyWGFwVyN4QN2Jt2Od/5MlMtJ6oS3+nk36odpBEfnjp3+G8txklx ++QqquPRLNcxyxrR0iflDHNgjZRxQm9yM5TD50XrPPtXUu4dfvYMvJ7jb+qN9FMW5 +3JkltOiPsQ== +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/6381_key-certbot.pem b/letsencrypt/keys/6381_key-certbot.pem new file mode 100644 index 000000000..4ad2a2707 --- /dev/null +++ b/letsencrypt/keys/6381_key-certbot.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +X8iyT0pQcmIhGTDy0/UdBjYsVpKA +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/6382_key-certbot.pem b/letsencrypt/keys/6382_key-certbot.pem new file mode 100644 index 000000000..dfbe91f28 --- /dev/null +++ b/letsencrypt/keys/6382_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUKjxrTiWAFknc +3cijIX5V56Z+mUolHJr4ZCUzSYRMwmQ2VxRk3GGFogC8oM6Nh+5FQ1y6qizOFCdD +2iyaqoSP/3DypED8PmjUPMcLFTletpDUyBCDg3ucnn3deu1KYhEpgIfu8h+UOIZZ +mzH4ugg6nONOOGqfkX0qROvxK180vWNrR2IllbijZybGl6BZ1ML7iB89RtsVPeQw +fWazrzqhXBoRp82RRCNqUz5MgQRpwWdVNrVppxUT0L21zN87xCW8yBGAQ7fn/YaZ +M3M9Yc0+VqZOl3LVJqrf9GcDEz1W4JMIElg/NFI5pgT70gxKQOylX2HeLa5cve7U +dInPbexhAgMBAAECggEAd0oIDo0xqILfpL9OP+plDgfhJO0rMxKST3Z/NAbxy/bA +QY1UeiEu8+PSZjxD5m+3GFp3mLx11KigKxZQXeXiAtSsvMB9iVXNuwcxIpocV5Ru +ejTClC8pITY7rnufT2M0IxGRXFfmSYA+icMopaBzYAE2DJTL3kv/A/Ucc8zfCtcq +Z3RpYT3tuNQRKb1leNd3/2bfkhy/YJXRQWVpCE1fABsyAHiAv9LY1IekOEfNDH2Z +l5w4l+lJqDI4xzPzYbqb+asdSKNWVS9w2iF/f4qv+SbM1BB4pTQC2b/cCq+yuOk4 +7KVhDXhDNJs7R8I/Ge1IYRrgP2f8dBSGAQlhd36/wQKBgQD7nRWY203FTEwPI9gD +9TYL5/hrjpZE3No+OlpUv7JIsnXKtkTfZ7YUTvV2B5AO5uI9y1jCp9HgqTSWZVd2 +zW8ymeBb6fhxwTlDR1PSMiQLB/ZE1+7K9tK46ejjfNY5w0Hkt8zkhED0BdfgbRVb +V85Gg6bfAHKhL79rNe9cAO80pwKBgQDX3RkaZa/H1Hss/lqSkVPJtBVSk+0MEVYS +9Wx5WOBTjHPpkKuCR6d0UmMOojtJoQh4pda4tAk3aE3j/1XD4CxICEntB4+k6UFi +7wlbrFn/Gd9k8fQLbYY+kMKNkQzmZKCrRYApAurN0/8qNLcV6AYkMpgniGoLiSN1 +y/0aPIqPtwKBgQC8MltkEKxT5WSCcoHxO+jn8OLbuDPnX/WRU94aw6NbQrheHgTX +wN/swr5QQQncS49vPvit6A5QZt8hmr1X7AK/K18oAJHGrArjqqckckKJSbRG++ft +Qb6Nds+tz8MAQ262309OoSlgHDrC73Ro9P0huvkGlXQn4engC+BzxXMlwwKBgACB +AqL+I8fqphL30QxQjIqHAhm8QKxrifDnY8Zwv61SQZ8E+HGIa0qpOpP5KvxEBPoL +IRIzUWYwtyXWHcQkTNYqNsn334z6Am4Rssrk/xzKWawpqHEyY0LYIawk74vGJl3f +/qmZ2SR73zehAeBqN0F0YMiO1/iI7G1E+aVLCOPHAoGAXoOPCwDAePklQd6KaY/G +Z1gIbO3/WrGvuruhLDxNBuuqTXI7uaoNRmXwDPXjxOPdOjH5VMaWb0Houk1p2YT4 +GJZ8/WESisxWb6zd4MHXld7BeYTu4VK4PMp3voxP+W7M+q6IEGGOXZKinm8eFLw3 +Nkc3RMyO/p0ldwMKhpIG81A= +-----END PRIVATE KEY----- diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index 578ea5743..5e13a7251 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEA2UZvcC3YrcY+b9bNgJVi05t/OxEA4spA2wnlF0WVIgACuaoa5/5q -O742MP2IUrEl9SW4IkXDu+raLG2i3TCpBkoYndpXP05vSdlWg0J6z+jZlmjhz3Uu -CMyPT1I63h/GSMqWvDKCQUqmsZJeCr4AOaVHHFWOE2BZL7ca4Q7tUXhk4S0swDS/ -DGJUL8E3GwsT8DH9tO+h3ZJxbytgY5L8h4ZafFu+lZD4Fz3QP6uo4YTAuctMnNw5 -a49BVy0lwgCP6zCf5kDvvHN+H/+1Pk8NarmioElU8R0+jEl1PgjW2qqEYw8rpj3z -RmtuqfmPnegJzpX07eaBthn7WkXl5iRKuwIBAg== +MIIBCAKCAQEAhahAn2pGjS02nJF+x6Kaok4IUF9I971qCV2LGZ0eA78xpfB2qzhS +iDeEGWlrt01FQQKKppOURoGG1Gr0vLYX6U+JVFw/HTsP5uzbX1rFcFT4Ckpqydqh +SaId11wFUy0esfPH7buaBRQAo6M4A5YbgzO/VieyLj0xKzp7/UK+F8qBICeQYk2/ +Z+vs53zCcNjiy4fd7fonU4XQJwPRFFU8sxTd8jI1thsoOxR4AU04ptNZ/9BjkL5o +fNCrEDDrlMfDVNVtCfveR0C8Ehi9tAKjw0XcdzX/anD/+vOaQh+EI8/ZKN+Cj8Vo +HiVZbo5BTIh996WZRIY6vUnNPvm0+LkyWwIBAg== -----END DH PARAMETERS-----