daily autocommit

diff --git a/.etckeeper b/.etckeeper
index c83fe52ce18e08518de7c76b3f606f5e78e9498f..870f0886079eb3cfff5bb43f266bd8241c755ddd 100755 (executable)
--- 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-5057.mount'
 maybe chmod 0644 'systemd/system/snap-certbot-5214.mount'
+maybe chmod 0644 'systemd/system/snap-certbot-5234.mount'
 maybe chmod 0644 'systemd/system/snap-core20-2669.mount'
 maybe chmod 0644 'systemd/system/snap-core20-2682.mount'
 maybe chmod 0644 'systemd/system/snap-core24-1196.mount'

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 290fafe2d3bb3091593526fcb09cd6c8afe0717b..b7edf50e897ae4197f8adcdbcfbebdfa5e646f25 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA7qoPEbNWjaIcayrFjDWr4L+Hth/Uc5CrzVWULG68IVBMx16IujXD
-oqVIQtzy/0icwtaDOGEE2v8/Og4YCINk+QYv7Z/WP4rc1m5MbY7dZn0HPIAHWpht
-C2WMXX63ojJGRcWL0dqOVogdV1KZtEakOsNSbqYgbJUuFnhVI/eTjPUCitjO8G6+
-k+i+3H9SSKpk+pck8nvJgLBH+YTmxeORHUR0gwgA3REhKQHMkL9eoNtnw1wqvb4o
-/q9OOy6UTKEhMBMHb/qaLMXX8unUuFsbVwt5OZQEL/xPoIlyyk9mm5vhXGWbSzlR
-iqPUKrnpN3rHj+Tqi6WLAHk+WXwvk6Q/awIBAg==
+MIIBCAKCAQEAgwBeZEhDa8dc74gzLTXcea4QM35fLUfLywhJf51H0Y9/eT9sIZQ8
+yqs44vzs5/S3yauGFK5WG3oUlGBjFb8rtc2riF3qu15QgvviXv1ZcCKbfWTRybe2
+8YcWo+A7dU1D8lv9v4nydE0KulDJzFfB2AawHwGIgg/Q5sTq6G1yQIagUeOVO1D0
+YNnh4xEtc1QquCef+suOkY7Ix13eavPD3uYcIrBPxhffoLpwdgu2Eb0uzUcYOzey
+lQ/dlRh+JPPiEW5sD0dnHhjYoJ01q32elIifLp0oWXiUNjrNvzmoFbbve7DLYsWR
+bS8aRTm3BcYf0jGUc5H5A5fe277oSExo+wIBAg==
 -----END DH PARAMETERS-----

diff --git a/systemd/system/multi-user.target.wants/snap-certbot-5057.mount b/systemd/system/multi-user.target.wants/snap-certbot-5057.mount
deleted file mode 120000 (symlink)
index 455b09a..0000000
--- a/systemd/system/multi-user.target.wants/snap-certbot-5057.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-certbot-5057.mount
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/snap-certbot-5234.mount b/systemd/system/multi-user.target.wants/snap-certbot-5234.mount
new file mode 120000 (symlink)
index 0000000..254b290
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-certbot-5234.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-certbot-5234.mount
\ No newline at end of file

diff --git a/systemd/system/snap-certbot-5057.mount b/systemd/system/snap-certbot-5057.mount
deleted file mode 100644 (file)
index ff70ccf..0000000
--- a/systemd/system/snap-certbot-5057.mount
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Mount unit for certbot, revision 5057
-After=snapd.mounts-pre.target
-Before=snapd.mounts.target
-
-[Mount]
-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
-
-[Install]
-WantedBy=snapd.mounts.target
-WantedBy=multi-user.target

diff --git a/systemd/system/snap-certbot-5234.mount b/systemd/system/snap-certbot-5234.mount
new file mode 100644 (file)
index 0000000..6fa2c5f
--- /dev/null
+++ b/systemd/system/snap-certbot-5234.mount
@@ -0,0 +1,15 @@
+[Unit]
+Description=Mount unit for certbot, revision 5234
+After=snapd.mounts-pre.target
+Before=snapd.mounts.target
+
+[Mount]
+What=/var/lib/snapd/snaps/certbot_5234.snap
+Where=/snap/certbot/5234
+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 ba0a2cdb05aa0317cd28da968472e0e6a634e5ea..94048a477a9cf3e31960e5becd749820043fed9d 100644 (file)
--- 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-5214.mount
+Requires=snap-certbot-5234.mount
 Wants=network.target
-After=snap-certbot-5214.mount network.target snapd.apparmor.service
+After=snap-certbot-5234.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/5214
+WorkingDirectory=/var/snap/certbot/5234
 TimeoutStopSec=30
 Type=oneshot

diff --git a/systemd/system/snap.certbot.renew.timer b/systemd/system/snap.certbot.renew.timer
index c7cf8c0d4991bd9bc31bc16c5737f1a998f4ce3c..263f4dfbb773ecfb2a9ba753056b48de64265d7b 100644 (file)
--- 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-5214.mount
-After=snap-certbot-5214.mount
+Requires=snap-certbot-5234.mount
+After=snap-certbot-5234.mount
 X-Snappy=yes
 
 [Timer]
 Unit=snap.certbot.renew.service
-OnCalendar=*-*-* 09:30
-OnCalendar=*-*-* 12:26
+OnCalendar=*-*-* 08:33
+OnCalendar=*-*-* 20:44
 
 [Install]
 WantedBy=timers.target

diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount
deleted file mode 120000 (symlink)
index 455b09a..0000000
--- a/systemd/system/snapd.mounts.target.wants/snap-certbot-5057.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-certbot-5057.mount
\ No newline at end of file

diff --git a/systemd/system/snapd.mounts.target.wants/snap-certbot-5234.mount b/systemd/system/snapd.mounts.target.wants/snap-certbot-5234.mount
new file mode 120000 (symlink)
index 0000000..254b290
--- /dev/null
+++ b/systemd/system/snapd.mounts.target.wants/snap-certbot-5234.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-certbot-5234.mount
\ No newline at end of file