From: mhoellein Date: Wed, 12 Feb 2025 05:26:17 +0000 (+0100) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=94b59b61c9de3208e974390c317c6b93a8b5dc45;p=vserver daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 9e0dacd37..595ef6735 100755 --- a/.etckeeper +++ b/.etckeeper @@ -21254,8 +21254,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-4193.mount' maybe chmod 0644 'systemd/system/snap-certbot-4325.mount' +maybe chmod 0644 'systemd/system/snap-certbot-4412.mount' maybe chmod 0644 'systemd/system/snap-core20-2379.mount' maybe chmod 0644 'systemd/system/snap-core20-2434.mount' maybe chmod 0644 'systemd/system/snap-core24-609.mount' diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index 308a57fe6..4b2b54398 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEA8otVxtjz6MQHDwMNpAA3WvtmCp6PYdbN5am/u3WSHhgZgGIxKh1M -PFLjeXCEelEFRLY9txCEWc5HSs3j4wjgmJIMuiqwO8Mlm+93cponIotaWp/vwQ4p -B+Clmq6Eu+hkKCLT/DRnLYEjpgfEq2EVJL8mS7gl/eEf1aJBzoYYXey6VIZ3Bop9 -bw+4e5T0zdjk2u3oDNxszMeemUJGZi271HVtO5F5TD8RSoYDPjCX0GJR3ZOuE/gI -0OaOKI/ZYTB6LnlvY24NxE8AauFQd5/Jo7gzW3jaypoc7yoI9ZccJih2l/3UON46 -imyo2Dx1TDFysq+gOgtsxjeXt7934mETEwIBAg== +MIIBCAKCAQEAuYPA8iteBHIsPcUjY8XBJXTF8ApUDIk45/eJ5z/7eXfqGRhsw7E1 +ItZbVXpPfho2AgFv8UO6Ls8NkJiq44/d5BY43cG2Gv11uZcjLACovtSo+JLRztgi +oDrH+VOHPDxOidoyWOvE6Z6ds+b1QvJIDCTc/nzf1DtOMDCDfRfnDV79Zf6Tdho6 +H8OIssFl5Jpf+bd4AEWBZrDYRKqNW8c7fXxTX+c1Zw/shCgZCOzi7faCiBwXTmNe +yFBa4un648klSDcMu17u8AMEzZheKmHJ788LgZ6usImJlFX8LmRXjpldc26uWT8H +66zgYtGKk5IyjC2YxNMHW5QmCeAapNhgSwIBAg== -----END DH PARAMETERS----- diff --git a/systemd/system/multi-user.target.wants/snap-certbot-4193.mount b/systemd/system/multi-user.target.wants/snap-certbot-4193.mount deleted file mode 120000 index 010c8f6d5..000000000 --- a/systemd/system/multi-user.target.wants/snap-certbot-4193.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-certbot-4193.mount \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/snap-certbot-4412.mount b/systemd/system/multi-user.target.wants/snap-certbot-4412.mount new file mode 120000 index 000000000..bec70a5e2 --- /dev/null +++ b/systemd/system/multi-user.target.wants/snap-certbot-4412.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-certbot-4412.mount \ No newline at end of file diff --git a/systemd/system/snap-certbot-4193.mount b/systemd/system/snap-certbot-4193.mount deleted file mode 100644 index 96616bbb6..000000000 --- a/systemd/system/snap-certbot-4193.mount +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Mount unit for certbot, revision 4193 -After=snapd.mounts-pre.target -Before=snapd.mounts.target - -[Mount] -What=/var/lib/snapd/snaps/certbot_4193.snap -Where=/snap/certbot/4193 -Type=squashfs -Options=nodev,ro,x-gdu.hide,x-gvfs-hide -LazyUnmount=yes - -[Install] -WantedBy=snapd.mounts.target -WantedBy=multi-user.target diff --git a/systemd/system/snap-certbot-4412.mount b/systemd/system/snap-certbot-4412.mount new file mode 100644 index 000000000..1953c9056 --- /dev/null +++ b/systemd/system/snap-certbot-4412.mount @@ -0,0 +1,15 @@ +[Unit] +Description=Mount unit for certbot, revision 4412 +After=snapd.mounts-pre.target +Before=snapd.mounts.target + +[Mount] +What=/var/lib/snapd/snaps/certbot_4412.snap +Where=/snap/certbot/4412 +Type=squashfs +Options=nodev,ro,x-gdu.hide,x-gvfs-hide +LazyUnmount=yes + +[Install] +WantedBy=snapd.mounts.target +WantedBy=multi-user.target diff --git a/systemd/system/snap.certbot.renew.service b/systemd/system/snap.certbot.renew.service index 6339b93ef..cb144d021 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-4325.mount +Requires=snap-certbot-4412.mount Wants=network.target -After=snap-certbot-4325.mount network.target snapd.apparmor.service +After=snap-certbot-4412.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/4325 +WorkingDirectory=/var/snap/certbot/4412 TimeoutStopSec=30 Type=oneshot diff --git a/systemd/system/snap.certbot.renew.timer b/systemd/system/snap.certbot.renew.timer index e527fdc81..228ff1f34 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-4325.mount -After=snap-certbot-4325.mount +Requires=snap-certbot-4412.mount +After=snap-certbot-4412.mount X-Snappy=yes [Timer] Unit=snap.certbot.renew.service -OnCalendar=*-*-* 04:29 -OnCalendar=*-*-* 17:26 +OnCalendar=*-*-* 05:56 +OnCalendar=*-*-* 22:05 [Install] WantedBy=timers.target diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-4193.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-4193.mount deleted file mode 120000 index 010c8f6d5..000000000 --- a/systemd/system/snapd.mounts.target.wants/snap-certbot-4193.mount +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-certbot-4193.mount \ No newline at end of file diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-4412.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-4412.mount new file mode 120000 index 000000000..bec70a5e2 --- /dev/null +++ b/systemd/system/snapd.mounts.target.wants/snap-certbot-4412.mount @@ -0,0 +1 @@ +/etc/systemd/system/snap-certbot-4412.mount \ No newline at end of file