From 2accdcad91cdc0338db35533bb1512e0c295c24a Mon Sep 17 00:00:00 2001 From: mhoellein Date: Mon, 4 Apr 2022 19:45:48 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 4 + cups/printers.conf | 6 +- letsencrypt/csr/3378_csr-certbot.pem | 16 +++ letsencrypt/csr/3379_csr-certbot.pem | 16 +++ letsencrypt/keys/3379_key-certbot.pem | 28 ++++++ letsencrypt/keys/3380_key-certbot.pem | 28 ++++++ lvm/backup/system | 137 +++----------------------- 7 files changed, 109 insertions(+), 126 deletions(-) create mode 100644 letsencrypt/csr/3378_csr-certbot.pem create mode 100644 letsencrypt/csr/3379_csr-certbot.pem create mode 100644 letsencrypt/keys/3379_key-certbot.pem create mode 100644 letsencrypt/keys/3380_key-certbot.pem diff --git a/.etckeeper b/.etckeeper index 66b076ed..5b05e02a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7597,6 +7597,8 @@ maybe chmod 0644 'letsencrypt/csr/3374_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3375_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3376_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3377_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3378_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3379_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' @@ -10977,6 +10979,8 @@ maybe chmod 0600 'letsencrypt/keys/3375_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3376_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3377_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3378_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3379_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3380_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 12c42a31..2260378b 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:779da420-f17f-372e-5f9d-00114995ea71 +UUID urn:uuid:c9f45e96-1559-3ff8-4bb3-32467e711bcf Info Location MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle -StateTime 1648937591 -ConfigTime 1648937595 +StateTime 1649024003 +ConfigTime 1649024006 Type 4188 Accepting Yes Shared No diff --git a/letsencrypt/csr/3378_csr-certbot.pem b/letsencrypt/csr/3378_csr-certbot.pem new file mode 100644 index 00000000..c551df1d --- /dev/null +++ b/letsencrypt/csr/3378_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ62 +BiW0jestnFE3TxtoMUiEw8fRVFBZ0kRm1HO7KfWCUHYd2ZEnMDoL8t8IdzN2AyX2 +vfR8XQGRPj8h2I/6mug2xgodEI2t3jWNgrc92gJoTjsZrwCAQQ34Tl/hTDsrM9g3 +ikLY1ggrv2GjFDPwTXZIyVUGkDZ7b6Mb6dr6BONJdn1qR8vMxQEHMjQW47Eb4xCl +100kc6Ygi0jhZNUZqaLD/GP4H++BGKNhS4bed58oLA6ISsiTmfBW7uXImGfTvnK8 +4L2M9OOmFiZBxZSJ966QCpbRJ60/tj0NRxeseaXlFRJFeg/ozNycXHDLqpoIohor +jZmyG9ar26rHa5grGOUCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCbVBXYZ8I2 +Ua2yjumVFEWt537wiSMjm+xZtFI8v+XUeo6nW4afFBfmxKo/T7ZnRGXgQ6gOruBi +KVZj1tbTh0t4A/7ayb8H20DM403kxGaKF3H5dYPKqJoAfzDaqlw7GlLtOg+AH0EZ +E7tj7CwzZNPJFScaSMEVrUTcANkJeZAZApckbHxBjo/qqPwKrmCaHVpem7pc1leE +N1x4gYhOIcw3rbFdlZEq8zRYjMgcPpFz1WBfDb8PokC9gTl9lO49h7+E/E7oeuIF +yJTgPW3NEiH9FSYBlkC9nVTbPct7sGR0w122eXtr2VgRVX2Z8ao+yzmA1O9MSjrk +HDmIC4b8ifoE +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/3379_csr-certbot.pem b/letsencrypt/csr/3379_csr-certbot.pem new file mode 100644 index 00000000..414418d1 --- /dev/null +++ b/letsencrypt/csr/3379_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJy +OZlmIdNDAH/yMZMwVVue+MHqFHUgU1FrWmCiG1CUD5Pd6iT1eHu5NzdVonF6w9OP +SLm553Rt5Zp0nRMVBqmZTLZX7TGwJ7d+kmwRq9LfisAMAZYNbLyOGWrybZzisWez +KOFKlbh4hWTtX31MsBnR0GFJ+5j4aGt6Fc3eypP3aVKLvt3GD7lkDS3MesptnKVq +ugUtvNm6Wnfqu6/reiKhi20DabbMq4sRIxiUzXB+UPe12EDwuFAs/STcTF0kArd7 +JG8Tm+xj0sQE44lIaJjjNsSpwE0jHuOHlDwQfBJ5uoGRqmAewJDunClQquTuq3Hb +4/zH+EzENBql7pfL5zECAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAjC/F4vAZM +sSqCHiI1q3ij3ATV/1jOY/oveN+gq6pt0X/fKNxRg6fyQwwwCtMf8VaeHT32XZv3 +fbFo+T0lV/MIA0BzwUcU6Jxha7vFDS+uRv5QjDJFi1fps7Z/zNyON7sAJMlJIyQQ +uL11m6vK8KlRGen0lbaywiJ0fXf4J4TmlWScME2IZVbqyzoEm3hKzdNWEPC+luh/ +wzD6XkXQV2H0q5pZysleo/hw1Pow8DVK5xPF9ZO0mTL9M2uS5gQeOFEEQw6exZtc +2NLbT9I+rch2+oBVciIPngTkkriRl6cgTewWaEyX6lU/OoBHsga7+hnnwf60eIit +MwE86qTB/WeJ +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3379_key-certbot.pem b/letsencrypt/keys/3379_key-certbot.pem new file mode 100644 index 00000000..b709e896 --- /dev/null +++ b/letsencrypt/keys/3379_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCetgYltI3rLZxR +N08baDFIhMPH0VRQWdJEZtRzuyn1glB2HdmRJzA6C/LfCHczdgMl9r30fF0BkT4/ +IdiP+proNsYKHRCNrd41jYK3PdoCaE47Ga8AgEEN+E5f4Uw7KzPYN4pC2NYIK79h +oxQz8E12SMlVBpA2e2+jG+na+gTjSXZ9akfLzMUBBzI0FuOxG+MQpddNJHOmIItI +4WTVGamiw/xj+B/vgRijYUuG3nefKCwOiErIk5nwVu7lyJhn075yvOC9jPTjphYm +QcWUifeukAqW0SetP7Y9DUcXrHml5RUSRXoP6MzcnFxwy6qaCKIaK42ZshvWq9uq +x2uYKxjlAgMBAAECggEAYXHFCHV5BUI1za+1xFAOokXRpuehaswbS6APJRdvRavD +FyJwqKx08c7QSZv7A/+bIz4BlxCcUhAJNd3kB1KItbablS4PMc3ktuCxtywkpIHC +NosoZZhZWOhxxnCfy1xVMpW3MB/OGaoykRH9n34VMWCzLJ8hADJ9cpn61VXYlmtW +tsY9M/IEAstNzalL2N0tk6enEu0y3kr+uqQ5tn1SRpGFEbTwEtPpR0ux78rbNav/ +aULp1JjqGd3HD0Mcl1CPIn3XNvK4+xa2p7lW1+VLqSpr1M05DodXEZSgjn8mU+jl +/sx2f1AHaD3H2icaIgsJKuV4+HvKP7hxdoDqe9IiwQKBgQDSJTuOnDJl3xURSb4r +yjJKeLaoFJYHXaCDm0xw3OK2OONQBKceN9PQLO+i1GZmWCk8subyz2jCtGXBFg6L +evRfI5kMKvwypXV5+/RQuh8C6X5kPwx6kHR8PyieVgbiDvjWua8xmiUmZbUXPsiJ +XpavNsvtYYSjQBxnUisWaPcn+QKBgQDBV6ed9G1kOtoDImpevevIJs67nfeab/wF +ji9Y6CZnhf/mqs9CLiPfbb9Brz6mLHH+bZ7N+AEz0udjWT/y+k1VL8f2fY7dANkY +DxKXHKJVxuAR0TCAtM71EjdAb4Atb9AzJo1eKAc5cOcXcHG6P0sK/QjL0CoYLeYP +ql/i1tdrTQKBgQCNKROLpWK5SZQGS+nh0m3b1qCj4UgyZHMpVI2Rlt73ltki7C0y +QEAZK8ZBM7ohb4Er0+UNH8P4XmOnw2A703kJ24i4QrusbbavHU8tVwjz1NLhFfUU +86o7t9VaHuF6wqHm405K3Iet9k4h8juVAyPnSMDNkV8epjcuNGTbJeE4SQKBgC2x +ysKxHx1+L0JoYt1rY4tVaKy84+UTLGwfs57+lv0GlXltyzgn8YB/zqD2iwb5ICPy +woKJZ7dY1CkN0ehaMea9OTRPbnFbHvPptAoU0WUWcKSlXSI+GV+gY4COGawjbgB4 +zxZ+vV5dCbDneWl8Rf8d2HNbCmfWiTYQnULeZeFNAoGABYK4HRzJR5ickW/+/JPT +oVYGQs+K2mlKQk4HUUquKSTiFZqx2PaGrRN85EaC/lhK0IY7r+k6DuisEAujNpPl ++OiCfJxz8YpAt/HX88ruN+DC0Y39Nqv45HuTQd5zaD6J61PzTYyiPNkDgwXKUFQS +XJXsQ+YMQK1OQUB942j5CMs= +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/3380_key-certbot.pem b/letsencrypt/keys/3380_key-certbot.pem new file mode 100644 index 00000000..921f32cc --- /dev/null +++ b/letsencrypt/keys/3380_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCycjmZZiHTQwB/ +8jGTMFVbnvjB6hR1IFNRa1pgohtQlA+T3eok9Xh7uTc3VaJxesPTj0i5ued0beWa +dJ0TFQapmUy2V+0xsCe3fpJsEavS34rADAGWDWy8jhlq8m2c4rFnsyjhSpW4eIVk +7V99TLAZ0dBhSfuY+GhrehXN3sqT92lSi77dxg+5ZA0tzHrKbZylaroFLbzZulp3 +6ruv63oioYttA2m2zKuLESMYlM1wflD3tdhA8LhQLP0k3ExdJAK3eyRvE5vsY9LE +BOOJSGiY4zbEqcBNIx7jh5Q8EHwSebqBkapgHsCQ7pwpUKrk7qtx2+P8x/hMxDQa +pe6Xy+cxAgMBAAECggEAeDBBJVXJ4I4XTxXkWBvM0hn/uDQeNUlhdMxWohFtTld7 +Kn/kTaJb1RFJ5GY0NDSYouy18goJn7zJUb/Lb+fQhfiv13zfUIEyLv/8RPeeADj6 +LiGoC9Xc8B7Rddv1Ah8ZmBvuo9dlgksCpZjPoQg+8BUGQhDfegeN5R3kg7XUQdXZ +C7LkYjfW5q/LtHvzjj7dyYs8USlvZeN4slz0Z4cuTtvYDGDjHfG/PxDIJ7b+Pyp1 +5QrpUi4Iz9KwYCLdU+9T2TOjLG9bRHXylYY7jnfM3UFUV4PoCmAr+D3nGYFSL/tn +XqHo98gVFoasclMdKkMsA77xhzS7g/WyWF3wIOadMQKBgQDf4MgE/lTDeXWt66ro +6wQRNdbul1o2ZjkWaRUUP9+qNt+dIizGKuHoo/EQ8gsITUzCtQ695quBP8waJ8AP +1iUENkRKBxerAGVjO0TKxqjNNSkRAiWu+5tAcyqopB7EGL0RbilKWQyOr/zZeh1r +KtHp4yWf1rPZ1xDZj28Na91TnQKBgQDMDLICAHPcTwSEu9N44wvSr/PlD5iKQPxE +H2lvV1eeor7binvMAWlvXdTNbaD2fzYwcXNotd95CoAlNaM4J9Ud1MKsZ0MNOxH0 +9PvHp5VrxMy231ggbjtRadzDvfy0cpdg7D3NdkWyLfzThsMcY0vUbgmL/MupEmkH +s7YYvokfpQKBgG11DxYx6utvdPPFp1gdn21yr1UTts2mCP9F/UJbQFWOYqIG1XFG +AhGmJfStAmvar077CuwZ3Xxh3r5i9OpJPuviRF0VPqMinG95yNaDboB2H0/rhtUY +uv010YOGSmyB096zx4hMJXGV5b/Gjp+Y3ezGW9zcMi6tkdVs5VTgieOZAoGAMi71 +IJTn6cjtPY/MJLECWWC4xR8ezvHImSB4l8+NVxCDjA70/2lheuhCy/soWTdUJnng +fmIsgeJZPc2BRPBW860965TB4uEiO3J88c9/ai/OgTNQwzkZEZ7Nkr6JBgAgxs+T +K5Lo9TdmNMex+KtbHPWrF2im1gAXILPMFy3VH5kCgYBu1Hh6jkerB0nulEURyZaV +EsTd7E208mf13nyGqGJhL7N7Trs+NRtoTkYJw0IeMLdCcVZd4EcfnD7yyQZW/pXn +LYQu8+3XVXEN0euK+cocLssF3+27dQp2ges9AdxHQW8PPaiKrmHouQW+hJYQnuLl +W1vABF4//s2xIXwpHEfaBw== +-----END PRIVATE KEY----- diff --git a/lvm/backup/system b/lvm/backup/system index 8efe5c46..e4ba96c1 100644 --- a/lvm/backup/system +++ b/lvm/backup/system @@ -1,16 +1,16 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Mon Apr 4 00:00:04 2022 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Mon Apr 4 19:44: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 'lvextend -l +50%FREE --resizefs /dev/system/var'" 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 = 1649023204 # Mon Apr 4 00:00:04 2022 +creation_time = 1649094273 # Mon Apr 4 19:44:33 2022 system { id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv" - seqno = 1012 + seqno = 1019 format = "lvm2" # informational status = ["RESIZEABLE", "READ", "WRITE"] flags = [] @@ -94,7 +94,7 @@ system { flags = [] creation_time = 1641801655 # 2022-01-10 09:00:55 +0100 creation_host = "homeserver" - segment_count = 1 + segment_count = 2 segment1 { start_extent = 0 @@ -107,40 +107,9 @@ system { "pv0", 10240 ] } - } - - swap { - id = "yDpu3l-FwLw-46ey-BCOE-a8se-MEcw-Anmziy" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1641828998 # 2022-01-10 16:36:38 +0100 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 4096 # 16 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 37120 - ] - } - } - - root_backup { - id = "udSAI8-nZKj-uDak-Vbgv-fOWq-wnXq-RFTQ0G" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1649023202 # 2022-04-04 00:00:02 +0200 - creation_host = "homeserver" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 2560 # 10 Gigabytes + segment2 { + start_extent = 25600 + extent_count = 9916 # 38,7344 Gigabytes type = "striped" stripe_count = 1 # linear @@ -151,104 +120,26 @@ system { } } - home_backup { - id = "nZQy2D-dwz2-DibA-7Eg7-m1gE-24zZ-oMiVeP" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1649023204 # 2022-04-04 00:00:04 +0200 - 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 = "Aoe0ja-lEKy-vfAs-TyM8-l8WY-UYzP-rB6D9i" - status = ["READ", "WRITE"] + swap { + id = "yDpu3l-FwLw-46ey-BCOE-a8se-MEcw-Anmziy" + status = ["READ", "WRITE", "VISIBLE"] flags = [] - creation_time = 1649023204 # 2022-04-04 00:00:04 +0200 + creation_time = 1641828998 # 2022-01-10 16:36:38 +0100 creation_host = "homeserver" segment_count = 1 segment1 { start_extent = 0 - extent_count = 2560 # 10 Gigabytes + extent_count = 4096 # 16 Gigabytes type = "striped" stripe_count = 1 # linear stripes = [ - "pv0", 46336 + "pv0", 37120 ] } } - - snapshot0 { - id = "Q6qmD4-N3bx-zIMW-o1si-Qr1Q-tqVM-y0CrKN" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1649023203 # 2022-04-04 00:00:03 +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 = "3mqZsa-2u7E-lctA-fAcn-yKUM-Ad3i-mkQn0a" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1649023204 # 2022-04-04 00:00:04 +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 = "O4y7jr-Nj9O-HdW9-XYAb-uq1X-RC4p-m4iNH1" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1649023204 # 2022-04-04 00:00:04 +0200 - 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" - } - } } } -- 2.43.0