saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 0f91f35a30d00eb007b79597252023f761c45a08..1dde60a3fdd3b3fef240f4a023271465e55f1e56 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -7569,6 +7569,7 @@ maybe chmod 0644 'letsencrypt/csr/3350_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3351_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3352_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3353_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3354_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'
@@ -10925,6 +10926,7 @@ maybe chmod 0600 'letsencrypt/keys/3351_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3352_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3353_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3354_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3355_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/letsencrypt/csr/3354_csr-certbot.pem b/letsencrypt/csr/3354_csr-certbot.pem
new file mode 100644 (file)
index 0000000..648a844
--- /dev/null
+++ b/letsencrypt/csr/3354_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/G
+WkYC/WlG0XSsy7lWplYNHHzmqXz7OKM0lKIeA5BhL3mIeduXiZVRC5IkNLCOmXlf
+k1WDYbLSqGwob6TM0APQWqqouR5IwVQyrhGk7nDJAS2+ZoAK/bSLDrVI+ocdMwMA
+OUDTIowt/vBk0e7BOnxsh9hKbeh+Hkg9PbytEYWlw6ZmRn6PP7KHBWractEQvEcB
+0G7jzNwDdDeJ5HwgVgqbuHxRFUVKe9al/ZLpk19rEomFT9pXEixS8D/bgi9ij0AB
+FvpP6RDX6lQF73YYZ0J3YgNfpj+9+fLvyBuupcjqxqvQ8DlHDTbAwjhYOqKxFgMQ
+I+MTV5CnOKDzd2acW/8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQDEoBYvbuEB
+sf6u6+67zFV/cFkliXwplYHuVuj7E5tEZ/9ukmgbaRitiCrnZRUCFC6jKBqNKVPj
+qokg7+kLc1WARzwCj1r9YdaXW8hcCRlZ35PxKasN8TeIo4J5oy/dge+o3lKMkvJg
+c2AA2CQktK9lmyQnKoEsessrcQQ1qypm3tLZhHHfwyOfh9QZuAA5QKp/pnHOtxU/
+FJYdYmuDhBeXBRsu8xNCtCxlpMo4tFInqzD7yC395K6y/SRMbljaysbe+DFSY3D5
+vrsEnyBX8TXNxThJGbNHLNdzbRv+BtVqxiZZS9Rf17tEBm4zpAyJoxpsRT0TKgQt
+VNjD7nOCxkrR
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/3355_key-certbot.pem b/letsencrypt/keys/3355_key-certbot.pem
new file mode 100644 (file)
index 0000000..9cc93f0
--- /dev/null
+++ b/letsencrypt/keys/3355_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDPxlpGAv1pRtF0
+rMu5VqZWDRx85ql8+zijNJSiHgOQYS95iHnbl4mVUQuSJDSwjpl5X5NVg2Gy0qhs
+KG+kzNAD0FqqqLkeSMFUMq4RpO5wyQEtvmaACv20iw61SPqHHTMDADlA0yKMLf7w
+ZNHuwTp8bIfYSm3ofh5IPT28rRGFpcOmZkZ+jz+yhwVq2nLRELxHAdBu48zcA3Q3
+ieR8IFYKm7h8URVFSnvWpf2S6ZNfaxKJhU/aVxIsUvA/24IvYo9AARb6T+kQ1+pU
+Be92GGdCd2IDX6Y/vfny78gbrqXI6sar0PA5Rw02wMI4WDqisRYDECPjE1eQpzig
+83dmnFv/AgMBAAECggEBAI32LrPrUw3dTzty3PdTVu8woihMyb0VQQtx36Qs8a5y
+WKenMetxzJVy/H7rsfx4UjB1twsUa2ptOJo9vppRPkd80pYMFf+1IjLPNdPkZu40
+yFNi5lHSMKps4K3IoTQ0JSiFvJioKdCxlKDXogCJkdZ1qROFNzdFBJfDEC2b6n7v
+GLmt78IFFl+JFEbtyW1MJUnTFb7fN9qaQJsuWCSzsyOVHOy1CAiwqKwMMugh/1n4
+aTcBrfRJ3Eh50qN+OuaC4jqg9MvXDgrYwlTB/7BWf/+oVDpFx+axBuh7gAmVWt0L
+Hxz1mAWsK6+ZgjZ+iM5RH1OruG14yZVq+J440x0ZxWECgYEA/7U5vL0GZKY3WPvj
+h4RwAsXFrN91RPfH2wngGddWVJ7yY7cf3TWoHKfXigd1dpX8YkuhW19RSG0Ox3kK
+WOMlFgqiiBI9PGj4TEBSDAo8IPACmBcK1zLXg9X5vpm1V1k+4yFD5bqRZnKB2k7D
+TjEf4M4OaUOzVmvXaaHCWcZ7DSkCgYEA0AMcRT4a78NmB0oZsD86unQ7a8dimc9X
+iV493j9SsNM4LO9CRklrLsFI6t65PCyCzktMMeqn126TGDNywig/HaKGV08Yh4eO
+UE3sdlB8ZamMbIOMYMDnQKwsA9SFTdPzCAzT+RuV5BP4L8DfK3bIGA6JQgIInk42
+NoPgmZhrHOcCgYEA2GDhT63gmBDzKvBTdByEsEPs50FcOZU24Eo2AYfvvMGXuPuA
+Ei9SZ5U71chEBKocnI0FKI26+X+XjwIE2Hy1qDYtnNlaSiFFYzjWdOvAP9r5RvvQ
+p5OVPTE3Gat2AUk65vYCP4alfTyOV05pBGSbZh7XoQmx2wJ8kR1ZmaBUBikCgYEA
+mauylvTqsXaJSZlUoQAVQunbfCQwk7C52qHk0uu1Cyz/szKOo55ZsJDabalc7zdy
+6zR1desFVAI8aQSZIxbYiewnkxi75mQenvTyW/XZ8MDxHLmSW2gnb3/ChJHcaULL
+qIbRkpbuhTC7iYvTUyjNafhTLpCSDWF6a4vBwbb4asECgYEA3t+g0N8j0ay5dc8z
+eMXY43hUSU638VqNLXiETQ620bBiuzKFAWDgdRQI5dhsQQi2UDvDaDpEKt5aeZA7
+fEvGscAnZ8yqz20cxNycGdWE+5TKLNseXAdg/TgwF0PKJozK2CTR9kQvfR4nuUfw
+PWttK4OyFgFXodCpN3VCtqylxkw=
+-----END PRIVATE KEY-----

diff --git a/lvm/backup/system b/lvm/backup/system
index 13e363a3250d1ae84169ca97a5f8c00da562dbb9..fbbe8a9c98f88b4b2ff9439f1ff24734dbfb4865 100644 (file)
--- a/lvm/backup/system
+++ b/lvm/backup/system
@@ -1,16 +1,16 @@
-# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Mar 24 00:00:03 2022
+# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Mar 24 00:23:33 2022
 
 contents = "Text Format Volume Group"
 version = 1
 
-description = "Created *after* executing '/sbin/lvcreate -n var_backup -s /dev/system/var -L 10G'"
+description = "Created *after* executing '/sbin/lvremove -y /dev/system/var_backup'"
 
 creation_host = "homeserver"   # Linux homeserver 4.15.0-20-generic #21-Ubuntu SMP Tue Apr 24 06:16:15 UTC 2018 x86_64
-creation_time = 1648076403     # Thu Mar 24 00:00:03 2022
+creation_time = 1648077813     # Thu Mar 24 00:23:33 2022
 
 system {
        id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv"
-       seqno = 880
+       seqno = 886
        format = "lvm2"                 # informational
        status = ["RESIZEABLE", "READ", "WRITE"]
        flags = []
@@ -129,126 +129,6 @@ system {
                                ]
                        }
                }
-
-               root_backup {
-                       id = "p6yGPQ-KVfB-GJrV-A6DN-TNBI-wpXT-CKZiZc"
-                       status = ["READ", "WRITE"]
-                       flags = []
-                       creation_time = 1648076401      # 2022-03-24 00:00:01 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 2560     # 10 Gigabytes
-
-                               type = "striped"
-                               stripe_count = 1        # linear
-
-                               stripes = [
-                                       "pv0", 41216
-                               ]
-                       }
-               }
-
-               home_backup {
-                       id = "cEK568-j4xx-CdWr-ncwO-MX3U-NOwI-mAd5dM"
-                       status = ["READ", "WRITE"]
-                       flags = []
-                       creation_time = 1648076402      # 2022-03-24 00:00:02 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 2560     # 10 Gigabytes
-
-                               type = "striped"
-                               stripe_count = 1        # linear
-
-                               stripes = [
-                                       "pv0", 43776
-                               ]
-                       }
-               }
-
-               var_backup {
-                       id = "7JY9Cu-Cf2I-xWph-GcWH-cMR2-dKOa-GLaH4G"
-                       status = ["READ", "WRITE"]
-                       flags = []
-                       creation_time = 1648076402      # 2022-03-24 00:00:02 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 2560     # 10 Gigabytes
-
-                               type = "striped"
-                               stripe_count = 1        # linear
-
-                               stripes = [
-                                       "pv0", 46336
-                               ]
-                       }
-               }
-
-               snapshot0 {
-                       id = "qaAhzK-62Wj-NhTT-4IcT-Gs6d-maYv-ccwPZw"
-                       status = ["READ", "WRITE", "VISIBLE"]
-                       flags = []
-                       creation_time = 1648076402      # 2022-03-24 00:00:02 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 6400     # 25 Gigabytes
-
-                               type = "snapshot"
-                               chunk_size = 8
-                               origin = "root"
-                               cow_store = "root_backup"
-                       }
-               }
-
-               snapshot1 {
-                       id = "YJoAQg-ILYl-SBtq-ydXP-nf4N-Om0O-qCBXaq"
-                       status = ["READ", "WRITE", "VISIBLE"]
-                       flags = []
-                       creation_time = 1648076402      # 2022-03-24 00:00:02 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 5120     # 20 Gigabytes
-
-                               type = "snapshot"
-                               chunk_size = 8
-                               origin = "home"
-                               cow_store = "home_backup"
-                       }
-               }
-
-               snapshot2 {
-                       id = "dRfCtG-79rL-Jkzh-UGof-JsIe-4rPF-MO12Wf"
-                       status = ["READ", "WRITE", "VISIBLE"]
-                       flags = []
-                       creation_time = 1648076403      # 2022-03-24 00:00:03 +0100
-                       creation_host = "homeserver"
-                       segment_count = 1
-
-                       segment1 {
-                               start_extent = 0
-                               extent_count = 25600    # 100 Gigabytes
-
-                               type = "snapshot"
-                               chunk_size = 8
-                               origin = "var"
-                               cow_store = "var_backup"
-                       }
-               }
        }
 
 }