From f087a849c35b12e76d7f36ccd5138977e32e07ab Mon Sep 17 00:00:00 2001 From: mhoellein Date: Sun, 24 Apr 2022 08:46:10 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 2 + cups/printers.conf | 6 +- letsencrypt/csr/3421_csr-certbot.pem | 16 ++++ letsencrypt/keys/3422_key-certbot.pem | 28 ++++++ lvm/backup/system | 128 +------------------------- 5 files changed, 53 insertions(+), 127 deletions(-) create mode 100644 letsencrypt/csr/3421_csr-certbot.pem create mode 100644 letsencrypt/keys/3422_key-certbot.pem diff --git a/.etckeeper b/.etckeeper index 2de145e1..0382eaee 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7644,6 +7644,7 @@ maybe chmod 0644 'letsencrypt/csr/3417_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3418_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3419_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3420_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3421_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' @@ -11067,6 +11068,7 @@ maybe chmod 0600 'letsencrypt/keys/3418_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3419_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3420_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3421_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3422_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/cups/printers.conf b/cups/printers.conf index ffcc2d49..a73e6f41 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -2,14 +2,14 @@ # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -UUID urn:uuid:fee215ca-7714-3825-429d-8d2b51e57f7c +UUID urn:uuid:87ac1783-99f4-379b-6f5b-3d4a2346f497 Info Location MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1650665755 -ConfigTime 1650665758 +StateTime 1650752119 +ConfigTime 1650752122 Type 4188 Accepting Yes Shared No diff --git a/letsencrypt/csr/3421_csr-certbot.pem b/letsencrypt/csr/3421_csr-certbot.pem new file mode 100644 index 00000000..34b102ea --- /dev/null +++ b/letsencrypt/csr/3421_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALq/ +eBShzdgTPnvQEDhJ2zd5UZJt6ykreIohqeJPNgtUJ+9KxX7tc75ODZM8o1tVaOJv +p56XCuGRQAWQUbE8SjrULreJPQSGF8580K31DKSfpdqfXyBwy1hrjrJS/UXa5XTH +9i2X8B4aNhVnEunZKSkq8tTHQ//tFETWAA9IJNQghO1S5WjF7D8x6qVxhB+A4P12 +e/3A8JlqyAr/JOIze1RLE3+TMPsJi+A13BdfUM8HUD1McfmpAjWYVjHry2C3bgZT +m4Yb+gvxgIqFrD4aymH0QKn1bWjQKZ1krKq833eJYJwSj2w2nonyNoEny7Kg0qaW +tCHQMilrQSGKo6m9WPMCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAiPzQt/vU3 +kzqWgEg+uXZtMMnmg0vA4+NhBZ3YZLm+m5buak2pL58/bqomwF0k7NFCoJ4Oa5u5 +GR+kqQN6p1A1Rjhvn8jt9tbIlUV4BlS1lIz0e7Tp+lmGHaRzZxrpGYP8vBJ6E9I+ +s5PrYWMd/vGpIzXqhRgMbt6iZ+NKfUURez4+8CJyReB9Tch821Gi4noURBCKrhbg +07RScBVGTNY7Fw44nRu3uYK5cdD6kmXHAoPvQoaONL9oliyf+mIgxK/j9blAUE9T +TJCA1gdcRQgVSqmDOWhqFxX7T2jnyAivP8mghrH8SkRHSXvl02sYcdOYct/FMvyW +xOin23IVyE3o +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3422_key-certbot.pem b/letsencrypt/keys/3422_key-certbot.pem new file mode 100644 index 00000000..585e04f3 --- /dev/null +++ b/letsencrypt/keys/3422_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC6v3gUoc3YEz57 +0BA4Sds3eVGSbespK3iKIaniTzYLVCfvSsV+7XO+Tg2TPKNbVWjib6eelwrhkUAF +kFGxPEo61C63iT0EhhfOfNCt9Qykn6Xan18gcMtYa46yUv1F2uV0x/Ytl/AeGjYV +ZxLp2SkpKvLUx0P/7RRE1gAPSCTUIITtUuVoxew/MeqlcYQfgOD9dnv9wPCZasgK +/yTiM3tUSxN/kzD7CYvgNdwXX1DPB1A9THH5qQI1mFYx68tgt24GU5uGG/oL8YCK +haw+Gsph9ECp9W1o0CmdZKyqvN93iWCcEo9sNp6J8jaBJ8uyoNKmlrQh0DIpa0Eh +iqOpvVjzAgMBAAECggEBAJ2xCIkDiHoo5d5O9yNQ2lehjgwD3UtKdeLOQlHjaVNv +oLkjflmL0OylpDjsP1Tkbkim1/fGu1119YW9M/5hVp0OhtRcgrXLNVcbdmsuPZrV +ZIuTgBQ4qrzjNf/GrC/Mg211XJ9raUtB/uFbxFDLG0K0DZE3Imh9nVvzCOHenZqw +1vYol6xg2UZhqD2hWrYQJ2zw0vHcRTWJ382+cFPi+02c3t0UYmBNMQ4n4RpwNHJH +bwYr9csRgHzQryHbef4aOR3wBPdRrbVa3YCWQBzuXoy98uV5AzGA0PW3P7uywhBB +PWn7BuS1d2/mNw3FTNfRk5AktkVQI1NADcGVvBc2hiECgYEA93JXbBwF42CU0aaI +kTPyNdKYH6vzVq4w+heWGpBxBV+1gXTpokoNI8mdj344/ClKTVzViEEmpgSrX5hu +TX3dTnVm1ojk/RpgUylDPNUgeCOIkqKxD6kLEbHeqDHn+VA4jsIDtGW34LpL3B9V +G+SDBwZT3hcDA17ISt7zf11eUDcCgYEAwTQA+r9z5wLeFt8AhWrZo5zjSH1T4zj2 +6DWgAWiFwOlaBedEnygUERFkGnqvufswfMW7MS/X7HkVw68Scq8dS7JpV5RJOmF0 +9toNrXm/0I4KRwn4Em1RIyPd2SjUBW33ZtRWm/c1k6c2HSczisFf5NH6wK3wNR9n +w38jHYDHxyUCgYBhKc7WLrLJM/V71U6u5ZzoMYd2eEiW8tNcgMJ6L9mRaKGW8deD +2FwMf3CVFdU+fuAkPJ3EYQDSE+dPJEW7u/6YflUhTKPOFvtX7E3wpyeWxS0tlyC7 +q38jNZrepKoYJb3voJNf1Mk9Pynmh48d4r7olT19ab/PJPq1G5K1om4URQKBgQCl +QM31q/x/A7zi4yuW8qXlhDQDtO8j032dcQDDM5v0PaR6mC3h1G4Vi0KMQ5Q7B9eZ +YaeTktClu4waLI0i+xWbwabI+lUIUoOxASHh19lxkYzI5oYBfO+BlxQSwxFW85BB +rC3IidKR0NxAY196t5xGJDTOyfhD9/DRDtYCTjyS4QKBgQCnqKtK0UJwQsdcxAAa +OQHs3zn0oIDIElSILIn6cR6ST27bB3dOwhimyc3a5XxM2yn7Ad6u8tTnwfdD36rA +FKe7bSiAGIcyJE6oqhDk8rfSiIujBah0qT77r/znokVp5Z2xLdEuvYf8wrpdiRQu +385wE2mbOmza5/iwTJmxSxGCrA== +-----END PRIVATE KEY----- diff --git a/lvm/backup/system b/lvm/backup/system index a3ce01fd..94d4802d 100644 --- a/lvm/backup/system +++ b/lvm/backup/system @@ -1,16 +1,16 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Sun Apr 24 00:00:02 2022 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Sun Apr 24 00:24:19 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 = 1650751202 # Sun Apr 24 00:00:02 2022 +creation_time = 1650752659 # Sun Apr 24 00:24:19 2022 system { id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv" - seqno = 1253 + seqno = 1259 format = "lvm2" # informational status = ["RESIZEABLE", "READ", "WRITE"] flags = [] @@ -140,126 +140,6 @@ system { ] } } - - root_backup { - id = "q8DZ5H-lzqT-48fq-4Sv9-zY5i-I8Md-6cIUCN" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1650751201 # 2022-04-24 00:00:01 +0200 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 2560 # 10 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 51132 - ] - } - } - - home_backup { - id = "RDvhf0-0wtF-dm82-chdf-KHKJ-Szpi-rNZd3G" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1650751201 # 2022-04-24 00:00:01 +0200 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 2560 # 10 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 53692 - ] - } - } - - var_backup { - id = "3ecvJ9-MQDM-bQKv-wro5-rNMa-TL0l-2LJDPo" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1650751202 # 2022-04-24 00:00:02 +0200 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 2560 # 10 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 56252 - ] - } - } - - snapshot0 { - id = "LVExOp-1R0s-Ne7c-TWLh-AuA3-Rleh-KFadYY" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1650751201 # 2022-04-24 00:00:01 +0200 - 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 = "7Usk13-0P7B-mN4V-oQay-2CPG-QBI2-qNZ0fB" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1650751202 # 2022-04-24 00:00:02 +0200 - 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 = "SV1v2J-jjlW-hXrQ-eeHE-pj5L-PwBI-ha5r35" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1650751202 # 2022-04-24 00:00:02 +0200 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 35516 # 138,734 Gigabytes - - type = "snapshot" - chunk_size = 8 - origin = "var" - cow_store = "var_backup" - } - } } } -- 2.43.0