From 1176541f5dce41d2bf3cb6e4eda425e58c9e329f Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 8 Oct 2025 06:26:19 +0200 Subject: [PATCH] daily autocommit --- .etckeeper | 2 +- letsencrypt/renewal/collabora.hoellein.online.conf | 2 +- letsencrypt/renewal/dyndns.hoellein.online.conf | 2 +- letsencrypt/renewal/hoellein.online.conf | 2 +- letsencrypt/renewal/icinga.hoellein.online.conf | 2 +- letsencrypt/renewal/mail.hoellein.online.conf | 2 +- letsencrypt/renewal/nextcloud.hoellein.online.conf | 2 +- .../nextcloud.siedlerverein-wittgensdorf.de.conf | 2 +- letsencrypt/renewal/piwik.hoellein.online.conf | 2 +- letsencrypt/renewal/rainloop.hoellein.online.conf | 2 +- .../renewal/siedlerverein-wittgensdorf.de.conf | 2 +- letsencrypt/renewal/siedlerverein.conf | 2 +- letsencrypt/renewal/www.hoellein.online.conf | 2 +- myssl/dh2048.pem | 12 ++++++------ .../multi-user.target.wants/snap-certbot-4892.mount | 1 - .../multi-user.target.wants/snap-certbot-5057.mount | 1 + ...ap-certbot-4892.mount => snap-certbot-5057.mount} | 6 +++--- systemd/system/snap.certbot.renew.service | 6 +++--- systemd/system/snap.certbot.renew.timer | 8 ++++---- .../snap-certbot-4892.mount | 1 - .../snap-certbot-5057.mount | 1 + 21 files changed, 31 insertions(+), 31 deletions(-) delete mode 120000 systemd/system/multi-user.target.wants/snap-certbot-4892.mount create mode 120000 systemd/system/multi-user.target.wants/snap-certbot-5057.mount rename systemd/system/{snap-certbot-4892.mount => snap-certbot-5057.mount} (63%) delete mode 120000 systemd/system/snapd.mounts.target.wants/snap-certbot-4892.mount create mode 120000 systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount diff --git a/.etckeeper b/.etckeeper index ac023f9d8..d8ec7b9b2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -21255,8 +21255,8 @@ maybe chmod 0755 'systemd/system/paths.target.wants' maybe chmod 0755 'systemd/system/rescue.target.wants' maybe chmod 0664 'systemd/system/set-route-network.service' maybe chmod 0755 'systemd/system/sleep.target.wants' -maybe chmod 0644 'systemd/system/snap-certbot-4892.mount' maybe chmod 0644 'systemd/system/snap-certbot-4965.mount' +maybe chmod 0644 'systemd/system/snap-certbot-5057.mount' maybe chmod 0644 'systemd/system/snap-core20-2599.mount' maybe chmod 0644 'systemd/system/snap-core20-2669.mount' maybe chmod 0644 'systemd/system/snap-core24-1151.mount' diff --git a/letsencrypt/renewal/collabora.hoellein.online.conf b/letsencrypt/renewal/collabora.hoellein.online.conf index 1f2c13c37..d83b7d0b5 100644 --- a/letsencrypt/renewal/collabora.hoellein.online.conf +++ b/letsencrypt/renewal/collabora.hoellein.online.conf @@ -16,4 +16,4 @@ key_type = rsa [[webroot_map]] collabora.hoellein.online = /var/www/html [acme_renewal_info] -ari_retry_after = 2025-10-07T12:44:06 +ari_retry_after = 2025-10-07T21:52:04 diff --git a/letsencrypt/renewal/dyndns.hoellein.online.conf b/letsencrypt/renewal/dyndns.hoellein.online.conf index 11aa79c7b..5dc9d7ddf 100644 --- a/letsencrypt/renewal/dyndns.hoellein.online.conf +++ b/letsencrypt/renewal/dyndns.hoellein.online.conf @@ -14,4 +14,4 @@ installer = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:48 +ari_retry_after = 2025-10-07T21:57:15 diff --git a/letsencrypt/renewal/hoellein.online.conf b/letsencrypt/renewal/hoellein.online.conf index 954ff425c..75258e24a 100644 --- a/letsencrypt/renewal/hoellein.online.conf +++ b/letsencrypt/renewal/hoellein.online.conf @@ -13,4 +13,4 @@ authenticator = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:48 +ari_retry_after = 2025-10-07T21:57:16 diff --git a/letsencrypt/renewal/icinga.hoellein.online.conf b/letsencrypt/renewal/icinga.hoellein.online.conf index 5d65eeb38..4a43164b8 100644 --- a/letsencrypt/renewal/icinga.hoellein.online.conf +++ b/letsencrypt/renewal/icinga.hoellein.online.conf @@ -12,4 +12,4 @@ account = a089d0e38c551495d1f75d5adc8a26ee authenticator = standalone server = https://acme-v02.api.letsencrypt.org/directory [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:48 +ari_retry_after = 2025-10-07T21:57:16 diff --git a/letsencrypt/renewal/mail.hoellein.online.conf b/letsencrypt/renewal/mail.hoellein.online.conf index 2808d13b5..489f64949 100644 --- a/letsencrypt/renewal/mail.hoellein.online.conf +++ b/letsencrypt/renewal/mail.hoellein.online.conf @@ -13,4 +13,4 @@ authenticator = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:17 diff --git a/letsencrypt/renewal/nextcloud.hoellein.online.conf b/letsencrypt/renewal/nextcloud.hoellein.online.conf index 3d6a5eb89..4a08caaf5 100644 --- a/letsencrypt/renewal/nextcloud.hoellein.online.conf +++ b/letsencrypt/renewal/nextcloud.hoellein.online.conf @@ -14,4 +14,4 @@ installer = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:17 diff --git a/letsencrypt/renewal/nextcloud.siedlerverein-wittgensdorf.de.conf b/letsencrypt/renewal/nextcloud.siedlerverein-wittgensdorf.de.conf index ed1788cc2..ebb47140d 100644 --- a/letsencrypt/renewal/nextcloud.siedlerverein-wittgensdorf.de.conf +++ b/letsencrypt/renewal/nextcloud.siedlerverein-wittgensdorf.de.conf @@ -13,4 +13,4 @@ authenticator = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:17 diff --git a/letsencrypt/renewal/piwik.hoellein.online.conf b/letsencrypt/renewal/piwik.hoellein.online.conf index 207d95621..26381401a 100644 --- a/letsencrypt/renewal/piwik.hoellein.online.conf +++ b/letsencrypt/renewal/piwik.hoellein.online.conf @@ -13,4 +13,4 @@ authenticator = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:17 diff --git a/letsencrypt/renewal/rainloop.hoellein.online.conf b/letsencrypt/renewal/rainloop.hoellein.online.conf index a0ed11e5b..938d6b677 100644 --- a/letsencrypt/renewal/rainloop.hoellein.online.conf +++ b/letsencrypt/renewal/rainloop.hoellein.online.conf @@ -14,4 +14,4 @@ installer = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:17 diff --git a/letsencrypt/renewal/siedlerverein-wittgensdorf.de.conf b/letsencrypt/renewal/siedlerverein-wittgensdorf.de.conf index 5dbd82d5e..9ea5e6530 100644 --- a/letsencrypt/renewal/siedlerverein-wittgensdorf.de.conf +++ b/letsencrypt/renewal/siedlerverein-wittgensdorf.de.conf @@ -14,4 +14,4 @@ server = https://acme-v02.api.letsencrypt.org/directory installer = apache key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:18 diff --git a/letsencrypt/renewal/siedlerverein.conf b/letsencrypt/renewal/siedlerverein.conf index 2edc275a9..e2b3886cf 100644 --- a/letsencrypt/renewal/siedlerverein.conf +++ b/letsencrypt/renewal/siedlerverein.conf @@ -16,4 +16,4 @@ key_type = rsa siedlerverein-wittgensdorf.de = /var/www www.siedlerverein-wittgensdorf.de = /var/www [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:50 +ari_retry_after = 2025-10-07T21:57:18 diff --git a/letsencrypt/renewal/www.hoellein.online.conf b/letsencrypt/renewal/www.hoellein.online.conf index ce9dd92a1..28098f13c 100644 --- a/letsencrypt/renewal/www.hoellein.online.conf +++ b/letsencrypt/renewal/www.hoellein.online.conf @@ -14,4 +14,4 @@ installer = apache server = https://acme-v02.api.letsencrypt.org/directory key_type = rsa [acme_renewal_info] -ari_retry_after = 2025-10-07T12:48:56 +ari_retry_after = 2025-10-07T21:57:21 diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index d48c50eb4..456909452 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEA4uzcuJA2l1bxuxuuEqJ7/mkj+pexeTkQee1XQMMFkqfvO1IS0zk1 -nqaSZG8Xw0HWQ/V+kVBtNF+LI6iq3e1akCS3upulPlYRN4Kme2yfkDWYATtC2auR -QFxeIsViBLN4hSFWHonAK7gC1MqiSXYXcpWR6bhg0UKXT6BC/20n6cwJZt8NJDb+ -izVqskZGhcbwewBNacqycofTbq4e4Xqyl2yaM9Qy59oAekh34iXfmJoZMvf9/NWT -4++/QdxX209hRoJqPgmzPBECLWkysqTTw3Jk8OnaYLCE/81HoeruTatMgWAR+E1m -qwgD+XoHqJ55tLsbwWDkkyJ9fi3kUyrnUwIBAg== +MIIBCAKCAQEAjIRNwcfJnbNrD4SQjsVcwVtRJ1MagZ+umeWTArY0iAwQdsWNajCF +oYsfe4wzz+Jc2Q+cZA71GM/J0DS25XWSMTFiSA2hFX5MLnsbDBWwXHkoot9g3MEM +/fEdgxQrK42ebQeCZyqckMA4Xl+LrWywrQCBjBk5qXd/qYUGQIjv17wk688YNY3E +acn8Hl1yxjK/nNZ5b3RjHqNuZ4Jx2TuSpNTzAAR5QVZ0WA+GFG/rJkZe3qv8G1vr +cKuBYTD7fLAyRYetDNTFUbIEXv/iEHWeP30faY4OrGdzC0kQ+3A0vpYlYZiUDuDw +qzfhIV4XBcT2xUVcwV7oCPSIkb/xdmhPywIBAg== -----END DH PARAMETERS----- diff --git a/systemd/system/multi-user.target.wants/snap-certbot-4892.mount b/systemd/system/multi-user.target.wants/snap-certbot-4892.mount deleted file mode 120000 index 2134d15dd..000000000 --- a/systemd/system/multi-user.target.wants/snap-certbot-4892.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-certbot-4892.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-certbot-5057.mount b/systemd/system/multi-user.target.wants/snap-certbot-5057.mount new file mode 120000 index 000000000..455b09a18 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-certbot-5057.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-certbot-5057.mount \ No newline at end of file diff --git a/systemd/system/snap-certbot-4892.mount b/systemd/system/snap-certbot-5057.mount similarity index 63% rename from systemd/system/snap-certbot-4892.mount rename to systemd/system/snap-certbot-5057.mount index d53547589..ff70ccf1a 100644 --- a/systemd/system/snap-certbot-4892.mount +++ b/systemd/system/snap-certbot-5057.mount @@ -1,11 +1,11 @@ [Unit] -Description=Mount unit for certbot, revision 4892 +Description=Mount unit for certbot, revision 5057 After=snapd.mounts-pre.target Before=snapd.mounts.target [Mount] -What=/var/lib/snapd/snaps/certbot_4892.snap -Where=/snap/certbot/4892 +What=/var/lib/snapd/snaps/certbot_5057.snap +Where=/snap/certbot/5057 Type=squashfs Options=nodev,ro,x-gdu.hide,x-gvfs-hide LazyUnmount=yes diff --git a/systemd/system/snap.certbot.renew.service b/systemd/system/snap.certbot.renew.service index 1c6ca75bf..268b0c4ae 100644 --- a/systemd/system/snap.certbot.renew.service +++ b/systemd/system/snap.certbot.renew.service @@ -1,9 +1,9 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application certbot.renew -Requires=snap-certbot-4965.mount +Requires=snap-certbot-5057.mount Wants=network.target -After=snap-certbot-4965.mount network.target snapd.apparmor.service +After=snap-certbot-5057.mount network.target snapd.apparmor.service X-Snappy=yes [Service] @@ -11,6 +11,6 @@ EnvironmentFile=-/etc/environment ExecStart=/usr/bin/snap run --timer="00:00~24:00/2" certbot.renew SyslogIdentifier=certbot.renew Restart=no -WorkingDirectory=/var/snap/certbot/4965 +WorkingDirectory=/var/snap/certbot/5057 TimeoutStopSec=30 Type=oneshot diff --git a/systemd/system/snap.certbot.renew.timer b/systemd/system/snap.certbot.renew.timer index ce17c9bb4..7acc882b1 100644 --- a/systemd/system/snap.certbot.renew.timer +++ b/systemd/system/snap.certbot.renew.timer @@ -1,14 +1,14 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Timer renew for snap application certbot.renew -Requires=snap-certbot-4965.mount -After=snap-certbot-4965.mount +Requires=snap-certbot-5057.mount +After=snap-certbot-5057.mount X-Snappy=yes [Timer] Unit=snap.certbot.renew.service -OnCalendar=*-*-* 06:44 -OnCalendar=*-*-* 15:52 +OnCalendar=*-*-* 08:01 +OnCalendar=*-*-* 17:16 [Install] WantedBy=timers.target diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-4892.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-4892.mount deleted file mode 120000 index 2134d15dd..000000000 --- a/systemd/system/snapd.mounts.target.wants/snap-certbot-4892.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-certbot-4892.mount \ No newline at end of file diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount new file mode 120000 index 000000000..455b09a18 --- /dev/null +++ b/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-certbot-5057.mount \ No newline at end of file -- 2.43.0