From: mhoellein Date: Wed, 27 Apr 2022 11:26:51 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=76fb335fd171b29a55bdc9423d4d0a0fdfa29c63;p=homeserver saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index db019e4e..95415c3b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7651,6 +7651,7 @@ maybe chmod 0644 'letsencrypt/csr/3424_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3425_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3426_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3427_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3428_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' @@ -11081,6 +11082,7 @@ maybe chmod 0600 'letsencrypt/keys/3425_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3426_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3427_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3428_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3429_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/apt/sources.list.d/official-package-repositories.list b/apt/sources.list.d/official-package-repositories.list index b1d2d00e..0e481b7d 100644 --- a/apt/sources.list.d/official-package-repositories.list +++ b/apt/sources.list.d/official-package-repositories.list @@ -1,4 +1,4 @@ -deb http://packages.linuxmint.com tara main upstream import backport +deb http://packages.linuxmint.com tricia main upstream import backport #id:linuxmint_main deb http://archive.ubuntu.com/ubuntu bionic main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu bionic-updates main restricted universe multiverse diff --git a/cups/printers.conf b/cups/printers.conf index f272bb51..63f77214 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:b89eca21-fb25-3f10-483b-b060c6ca3210 +UUID urn:uuid:ba2d9303-d408-3a8c-67cc-66548eaf9c84 Info Location MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1650925011 -ConfigTime 1650925014 +StateTime 1651011223 +ConfigTime 1651011228 Type 4188 Accepting Yes Shared No diff --git a/letsencrypt/csr/3428_csr-certbot.pem b/letsencrypt/csr/3428_csr-certbot.pem new file mode 100644 index 00000000..f37cddcb --- /dev/null +++ b/letsencrypt/csr/3428_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM0O +cBqoiEBZzXnY/OTiCU47Y7Qple0Ajhdy1sfh5TLtwIKUEyPwUmSs0yWawPiAMBGu +7l6vB5YKa+aY8B5au8J2Uh7gqdq7qt3VlXg8nBYZRZv1+cW3sSazoUVBwI+m9e2X +8sKE0SBa+sYSqzb0kgJyG2PVyOefOyJekm0lk0XYwGD3iJiM6AzAG8AM6r98IH+g +fbP6OYG52v8p2ekOAbQuUKAF0g2awtNvTrO5gFOQ0foCn+4Cis1GXlWuj1wyeDgl +ds/YqOVwuhUhnrNjRN5GQAa9GUJ0OcFFBpk719tuiCQtIAHkSkT4l9Ydai5LN7Ep +ek6iULJE8RnXPXV0u4cCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCFtDzeFMWd +6gyY7iTHHUmPODZEdpRJsO6/VqQrKCd4vnRmiKHPuXRyOrx4kFZFufEN3Mv8/mDZ +bGAXaQR1e5u4F3anark3BCDJ+wpcps71GV4MTsT/p5lZ8QW3Nr0NTC4NPYPE9z4X +25CoIdXrF9R3kzMLS62bQJtLqctCrgKhz34Vhdu06Ds/xKXTOBCm6RnZc2lEV8OW +wNnGKVgPGpefXVfXrPMawtjRR7yrKpcV0oduOc9NhHY3AwvtLKbpPte0+sVpPTL4 +MSc+FONCBohFS01PUWSAbLtOeDYVnjoYraFPtOiKtV3glvWnhWX/3wYClP5+CAIF +k/0EedqXiT/q +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3429_key-certbot.pem b/letsencrypt/keys/3429_key-certbot.pem new file mode 100644 index 00000000..0d484321 --- /dev/null +++ b/letsencrypt/keys/3429_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNDnAaqIhAWc15 +2Pzk4glOO2O0KZXtAI4XctbH4eUy7cCClBMj8FJkrNMlmsD4gDARru5erweWCmvm +mPAeWrvCdlIe4Knau6rd1ZV4PJwWGUWb9fnFt7Ems6FFQcCPpvXtl/LChNEgWvrG +Eqs29JICchtj1cjnnzsiXpJtJZNF2MBg94iYjOgMwBvADOq/fCB/oH2z+jmBudr/ +KdnpDgG0LlCgBdINmsLTb06zuYBTkNH6Ap/uAorNRl5Vro9cMng4JXbP2KjlcLoV +IZ6zY0TeRkAGvRlCdDnBRQaZO9fbbogkLSAB5EpE+JfWHWouSzexKXpOolCyRPEZ +1z11dLuHAgMBAAECggEAdGgB0+BgmMdiEg3QYs6+oZ6tVxVUexqZj04uB4KBbovx +gS82PmyrGWPS6cIUUf3TS/aWc0HBeLep0Vp41YKEnDw3GjhHtFhdA1nAZGVj5leq +YIMeq9M/ycynfH17JxGNArgDo9FqNofvXIo0kBn+2UyVp/Mw/ewy0awGS9fM5xTE +qvhzau2a9qlaRUZ4oCqMIPQNqc1KrKGAzs7VavCLVdV0PbyIoYG3nAhDriglVRiT +63iCRgUyIG5CEV0EEGLljtfrC7wYDsA4tD4JOy0kyPE2Myc/qCgsBf1IQkuo3qjh +mP0BFNIvmt7eDm7S5DrZssabq7D7FVVQCuQ8cyFqQQKBgQDuXNx7R10576kIY7GV +lJL3vT+CvcxZriHG4lKXgphUKUBmm+nYX7KO3tf0kBdkoVPVg8Vn+YVnnp6NyxLd +G3g9nKx5XYVGtkDBypaJSf9TYEtJGZhEgu/mbUzmZei4kMLSLRcKow69OnVJp44M ++LFloD0oXuy4HQpBtoGkJEHWWQKBgQDcOq2LoPGLres5Pj2Q9X4W0S95a9nlQ1cH +lk5vuE1lDkusgXKozMzdMCBXNHqkdD2/9sXc43SFfIurAFyhEXndWCOR/t5ohdSt +Qf31VoUqO2nrXSD1VyzFSiln2SEd9F8HAqDfVBPOn5DCGotIDMxlcg2NWD2gr8Jz +fpvRI9qk3wKBgFKXMn40uAS/Gd6iTIH7vQDCPiNbCFd6kpGLEfsVcRqYQIxNMbWb +Uw9V/5Xp53EixR2STvA78RF6UI3o81xRjFQs2UYkNW3O8Jk1TPu8/A8zqmJlz/DN +Pbql3KNoZD6vShHxNa6l2RGQE9u1hu7PrQf9gbNfUL5qsYcbacgqF/XhAoGAfVXf +wuF71pTKlC959m/grLesnxvkTHhApY7DYQ2w7lxucOTTDoJP7WogXcD+M238Xq3g ++c9xVy8EhfOUxA4gHvq0c7hrd20DFv/BusjczKY3p72+riJI1pdYbUPDdzrGgkTa +rX86LpPdXLqingS6ptl8IP8hQ7wDnJtnrmULYF0CgYEAhjrbYzaScKJiOr6Sz5zo +bLrzdLjJrIggeuK1kmIWk9pIumRvmjkskJbzj5UUaA6lCxDTVS0c7NF5GRXYFcm4 +0B9W2UMTRBxw9HjC/gl/4oVSorwrHe0RbQVSbzLMJoGfHFfa4y7hkM4Ro6w2KGqg +IA/Nc/RX4C6cR1bdwS7KNBY= +-----END PRIVATE KEY----- diff --git a/lvm/backup/system b/lvm/backup/system index 249b1b7d..4aa69274 100644 --- a/lvm/backup/system +++ b/lvm/backup/system @@ -1,16 +1,16 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Wed Apr 27 00:00:03 2022 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Wed Apr 27 00:21:51 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 = 1651010403 # Wed Apr 27 00:00:03 2022 +creation_time = 1651011711 # Wed Apr 27 00:21:51 2022 system { id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv" - seqno = 1289 + seqno = 1295 format = "lvm2" # informational status = ["RESIZEABLE", "READ", "WRITE"] flags = [] @@ -140,126 +140,6 @@ system { ] } } - - root_backup { - id = "Tc8e2D-fc9f-BiYV-7VNO-8cGy-9kKJ-bfQfWe" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1651010402 # 2022-04-27 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", 51132 - ] - } - } - - home_backup { - id = "RrII2p-oTlg-DZlo-12hf-a0dw-COpH-Jsk3Tm" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1651010402 # 2022-04-27 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", 53692 - ] - } - } - - var_backup { - id = "w2ZkvX-7w5G-mev5-ZM7k-pJyS-NsC5-lNzrig" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1651010403 # 2022-04-27 00:00:03 +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 = "YsOeUz-TJyj-hf90-Ispp-SAN6-jWgN-OBMXim" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1651010402 # 2022-04-27 00:00:02 +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 = "hfelc1-6Fzy-ErrF-roqq-Eak3-z44n-Iy439v" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1651010402 # 2022-04-27 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 = "CR2mPm-LojU-fnAx-xkTJ-j2Hc-Sbfn-MSC1Hh" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1651010403 # 2022-04-27 00:00:03 +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" - } - } } }