From: mhoellein <mario@hoellein.online>
Date: Wed, 2 Feb 2022 05:47:58 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=55e21664d96c67bb313d65eab5a05ad05cde2537;p=vserver

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index 547e98180..04bcdd566 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -930,7 +930,7 @@ maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/timesyncd'
 maybe chmod 0644 'dhcp/dhclient.conf'
 maybe chmod 0755 'dictionaries-common'
 maybe chmod 0644 'dictionaries-common/ispell-default'
-maybe chown 'opendkim' 'dkimkeys'
+maybe chown 'redis' 'dkimkeys'
 maybe chgrp 'opendkim' 'dkimkeys'
 maybe chmod 0700 'dkimkeys'
 maybe chmod 0644 'dkimkeys/README.PrivateKeys'
@@ -950,6 +950,7 @@ maybe chmod 0644 'dpkg/shlibs.override'
 maybe chmod 0644 'drirc'
 maybe chmod 0755 'dropbear'
 maybe chmod 0755 'dropbear-initramfs'
+maybe chmod 0644 'dropbear-initramfs/authorized_keys'
 maybe chmod 0644 'dropbear-initramfs/config'
 maybe chmod 0600 'dropbear-initramfs/dropbear_dss_host_key'
 maybe chmod 0600 'dropbear-initramfs/dropbear_ecdsa_host_key'
@@ -9041,7 +9042,7 @@ maybe chmod 0644 'opendkim.conf'
 maybe chmod 0644 'opendkim.conf.save'
 maybe chgrp 'opendkim' 'opendkim/keys'
 maybe chmod 0750 'opendkim/keys'
-maybe chown 'opendkim' 'opendkim/keys/key1.private'
+maybe chown 'redis' 'opendkim/keys/key1.private'
 maybe chgrp 'opendkim' 'opendkim/keys/key1.private'
 maybe chmod 0600 'opendkim/keys/key1.private'
 maybe chmod 0600 'opendkim/keys/key1.txt'
diff --git a/crypttab b/crypttab
index 832051439..fdff148eb 100644
--- a/crypttab
+++ b/crypttab
@@ -1 +1,2 @@
 # <target name>	<source device>		<key file>	<options>
+sda2_crypt UUID=4010b095-db90-4a42-9730-9763b4f65a5c none luks,discard
diff --git a/dropbear-initramfs/authorized_keys b/dropbear-initramfs/authorized_keys
new file mode 100644
index 000000000..dfea58e99
--- /dev/null
+++ b/dropbear-initramfs/authorized_keys
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDcRoUeB0l7cWbtjul5H/h9uemE0wau8sUf5ceFQrHMS4ELqOOEAVy+W5wJIrGEB7PHSr/6p1a000ehyxlMWFQfZtpBfUkgS0UmOUVZ55FcNW6LW4uMYQdOQU7XimBOsgIF0sY4ODkjTaijg+fKpVyKjMoH8kGA3ECkmFu0fZq1YfN6YAxVAcwJcsTEShuc5qM4zNXGR9jV6PVZ9mUY3mwgsGTkJIjKkclwxZudmA+mla7Tcf12dDixBkdsTEuNxFzOlbPrsaeOMfX7tYfJSBpw2J+28r0g2mstIuyhEPbHP5+NhVeJGq2IcIG5SzS15TAKqMHmC0/McYnOuUQfVcHD1xl7CJ5T4wpvA10Y10MCwn1h89UfwUI+lUheqA7/YNwyblsWRzKWogz9UfnM8QtQpvxRy321OWrqX9DsXw9EKXPkDs8V1/LHHYH2Ud6weTMNDO+MuuiY2ucm/apvt0wjOdah3rrW3b2RiJMJWEP4MOXoDoZZAkTcury08cIYmkU= vserver1_luks
diff --git a/dropbear-initramfs/config b/dropbear-initramfs/config
index 8dcf5c02f..d39844a60 100644
--- a/dropbear-initramfs/config
+++ b/dropbear-initramfs/config
@@ -6,7 +6,7 @@
 #
 # Command line options to pass to dropbear(8)
 #
-#DROPBEAR_OPTIONS=
+DROPBEAR_OPTIONS="-I 180 -j -k -p 2222 -s"
 
 #
 # On local (non-NFS) mounts, interfaces matching this pattern are
diff --git a/fstab b/fstab
index 9bc36de01..81a0c6b0b 100644
--- a/fstab
+++ b/fstab
@@ -6,7 +6,9 @@
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 # / was on /dev/sda2 during installation
-UUID=78db1dab-fc39-4240-bd02-877c034b8229 /               ext4    errors=remount-ro 0       0
+UUID=af0b2b20-4340-4bcd-a140-646372def747 /               ext4    errors=remount-ro 0       0
+UUID=24dbfb7d-3c66-4c4f-b506-9dc377935a1c /var               ext4    errors=remount-ro 0       0
+UUID=015843ed-fea6-4a2f-83b1-e4df35019c4e /home               ext4    errors=remount-ro 0       0
 # /boot was on /dev/sda1 during installation
 UUID=9a9dead3-a6b5-47fc-b125-a60c58337d07 /boot           ext4    defaults,noatime        0       0
-/swapfile                                 none            swap    sw              0       0
+UUID=09da28b6-236c-4aaa-8576-66cc3741cfce                                 none            swap    sw              0       0
diff --git a/initramfs-tools/initramfs.conf b/initramfs-tools/initramfs.conf
index 70ec61401..1d57d5155 100644
--- a/initramfs-tools/initramfs.conf
+++ b/initramfs-tools/initramfs.conf
@@ -65,6 +65,7 @@ COMPRESS=lz4
 
 DEVICE=
 
+IP=:::::ens18:dhcp
 #
 # NFSROOT: [ auto | HOST:MOUNT ]
 #