From 1f0e850f279ba7e306ce4cc0ce0f80123e0cc716 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 20 Jan 2022 08:17:42 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 6 +- .../HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd | 188 ------------------ ...HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O | 188 ------------------ cups/printers.conf | 20 -- cups/printers.conf.O | 20 ++ letsencrypt/csr/3212_csr-certbot.pem | 16 ++ letsencrypt/keys/3213_key-certbot.pem | 28 +++ lvm/backup/system | 128 +----------- 8 files changed, 70 insertions(+), 524 deletions(-) delete mode 100644 cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd delete mode 100644 cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O create mode 100644 letsencrypt/csr/3212_csr-certbot.pem create mode 100644 letsencrypt/keys/3213_key-certbot.pem diff --git a/.etckeeper b/.etckeeper index cd897abe..c51a9aa5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2098,10 +2098,6 @@ maybe chmod 0644 'cups/cupsd.conf' maybe chmod 0755 'cups/interfaces' maybe chgrp 'lp' 'cups/ppd' maybe chmod 0755 'cups/ppd' -maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd' -maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd' -maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O' -maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O' maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd' maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd' maybe chgrp 'lp' 'cups/printers.conf' @@ -7371,6 +7367,7 @@ maybe chmod 0644 'letsencrypt/csr/3208_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3209_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3210_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3211_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3212_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' @@ -10585,6 +10582,7 @@ maybe chmod 0600 'letsencrypt/keys/3209_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3210_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3211_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3212_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3213_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/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd deleted file mode 100644 index ea78f210..00000000 --- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd +++ /dev/null @@ -1,188 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "2.2" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "ippeve.ppd" -*Manufacturer: "HP" -*ModelName: "Color LaserJet MFP M277dw" -*Product: "(Color LaserJet MFP M277dw)" -*NickName: "Color LaserJet MFP M277dw" -*ShortNickName: "Color LaserJet MFP M277dw" -*ColorDevice: True -*cupsVersion: 2.2 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*cupsFilter2: "image/jpeg image/jpeg 0 -" -*cupsFilter2: "application/vnd.cups-pdf application/pdf 10 -" -*cupsFilter2: "image/urf image/urf 100 -" -*OpenUI *PageSize: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize Letter: "<>setpagedevice" -*PageSize Legal: "<>setpagedevice" -*PageSize Executive: "<>setpagedevice" -*PageSize FanFoldGermanLegal: "<>setpagedevice" -*PageSize Oficio: "<>setpagedevice" -*PageSize 4x6: "<>setpagedevice" -*PageSize 5x8: "<>setpagedevice" -*PageSize A4: "<>setpagedevice" -*PageSize A5: "<>setpagedevice" -*PageSize A6: "<>setpagedevice" -*PageSize B5: "<>setpagedevice" -*PageSize B6: "<>setpagedevice" -*PageSize 100x150mm: "<>setpagedevice" -*PageSize 195x270mm: "<>setpagedevice" -*PageSize 184x260mm: "<>setpagedevice" -*PageSize roc16k: "<>setpagedevice" -*PageSize Postcard: "<>setpagedevice" -*PageSize DoublePostcardRotated: "<>setpagedevice" -*PageSize Env10: "<>setpagedevice" -*PageSize EnvMonarch: "<>setpagedevice" -*PageSize ISOB5: "<>setpagedevice" -*PageSize EnvC5: "<>setpagedevice" -*PageSize EnvDL: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion Letter: "<>setpagedevice" -*PageRegion Legal: "<>setpagedevice" -*PageRegion Executive: "<>setpagedevice" -*PageRegion FanFoldGermanLegal: "<>setpagedevice" -*PageRegion Oficio: "<>setpagedevice" -*PageRegion 4x6: "<>setpagedevice" -*PageRegion 5x8: "<>setpagedevice" -*PageRegion A4: "<>setpagedevice" -*PageRegion A5: "<>setpagedevice" -*PageRegion A6: "<>setpagedevice" -*PageRegion B5: "<>setpagedevice" -*PageRegion B6: "<>setpagedevice" -*PageRegion 100x150mm: "<>setpagedevice" -*PageRegion 195x270mm: "<>setpagedevice" -*PageRegion 184x260mm: "<>setpagedevice" -*PageRegion roc16k: "<>setpagedevice" -*PageRegion Postcard: "<>setpagedevice" -*PageRegion DoublePostcardRotated: "<>setpagedevice" -*PageRegion Env10: "<>setpagedevice" -*PageRegion EnvMonarch: "<>setpagedevice" -*PageRegion ISOB5: "<>setpagedevice" -*PageRegion EnvC5: "<>setpagedevice" -*PageRegion EnvDL: "<>setpagedevice" -*CloseUI: *PageRegion -*DefaultImageableArea: A4 -*DefaultPaperDimension: A4 -*ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898" -*PaperDimension Letter: "612 792" -*ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898" -*PaperDimension Legal: "612 1008" -*ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898" -*PaperDimension Executive: "522 756" -*ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898" -*PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" -*PaperDimension Oficio: "612 964.8" -*ImageableArea 4x6: "11.990551181102 11.990551181102 276.009448818898 420.009448818898" -*PaperDimension 4x6: "288 432" -*ImageableArea 5x8: "11.990551181102 11.990551181102 348.009448818898 564.009448818898" -*PaperDimension 5x8: "360 576" -*ImageableArea A4: "11.990551181102 11.990551181102 583.285039370079 829.899212598425" -*PaperDimension A4: "595.275590551181 841.889763779528" -*ImageableArea A5: "11.990551181102 11.990551181102 407.537007874016 583.285039370079" -*PaperDimension A5: "419.527559055118 595.275590551181" -*ImageableArea A6: "11.990551181102 11.990551181102 285.647244094488 407.537007874016" -*PaperDimension A6: "297.637795275591 419.527559055118" -*ImageableArea B5: "11.990551181102 11.990551181102 503.914960629921 716.513385826772" -*PaperDimension B5: "515.905511811024 728.503937007874" -*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921" -*PaperDimension B6: "362.834645669291 515.905511811024" -*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598" -*PaperDimension 100x150mm: "283.464566929134 425.196850393701" -*ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559" -*PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646" -*PaperDimension 184x260mm: "521.574803149606 737.007874015748" -*ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898" -*PaperDimension roc16k: "558 774" -*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016" -*PaperDimension Postcard: "283.464566929134 419.527559055118" -*ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165" -*PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268" -*ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898" -*PaperDimension Env10: "296.985826771654 684" -*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898" -*PaperDimension EnvMonarch: "278.985826771654 540" -*ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732" -*PaperDimension ISOB5: "498.897637795276 708.661417322835" -*ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614" -*PaperDimension EnvC5: "459.212598425197 649.133858267717" -*ImageableArea EnvDL: "11.990551181102 11.990551181102 299.820472440945 611.631496062992" -*PaperDimension EnvDL: "311.811023622047 623.622047244094" -*OpenUI *InputSlot: PickOne -*OrderDependency: 10 AnySetup *InputSlot -*DefaultInputSlot: Auto -*InputSlot Auto/Automatic: "<>setpagedevice" -*InputSlot Manual/Manual: "<>setpagedevice" -*InputSlot Tray1/Fach 1: "<>setpagedevice" -*InputSlot Tray2/Fach 2: "<>setpagedevice" -*CloseUI: *InputSlot -*OpenUI *MediaType: PickOne -*OrderDependency: 10 AnySetup *MediaType -*DefaultMediaType: HPMatte90gsm -*MediaType Stationery/Standardpapier: "<>setpagedevice" -*MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" -*MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" -*MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" -*MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" -*MediaType HPCover/HPCover: "<>setpagedevice" -*MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" -*MediaType PhotographicGlossy/Fotoglanzpapier: "<>setpagedevice" -*MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" -*MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" -*MediaType StationeryLightweight/Lightweight Paper: "<>setpagedevice" -*MediaType ExtraLight/extraLight: "<>setpagedevice" -*MediaType Intermediate/intermediate: "<>setpagedevice" -*MediaType Midweight/midweight: "<>setpagedevice" -*MediaType StationeryHeavyweight/Schweres Papier: "<>setpagedevice" -*MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" -*MediaType PhotographicHighGloss/Hochglanzfotopapier: "<>setpagedevice" -*MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" -*MediaType CardGlossy/cardGlossy: "<>setpagedevice" -*MediaType Transparency/Transparenz: "<>setpagedevice" -*MediaType Labels/Etiketten: "<>setpagedevice" -*MediaType StationeryLetterhead/Briefkopf: "<>setpagedevice" -*MediaType Envelope/Umschlag: "<>setpagedevice" -*MediaType EnvelopeHeavyweight/Schwerer Umschlag: "<>setpagedevice" -*MediaType StationeryPreprinted/Vorbedrucktes Papier: "<>setpagedevice" -*MediaType StationeryPrepunched/Gelochtes Papier: "<>setpagedevice" -*MediaType StationeryColored/stationery-colored: "<>setpagedevice" -*MediaType StationeryBond/stationery-bond: "<>setpagedevice" -*MediaType Recycled/recycled: "<>setpagedevice" -*MediaType Rough/rough: "<>setpagedevice" -*MediaType HeavyRough/heavyRough: "<>setpagedevice" -*MediaType PhotographicFilm/Fotofilm: "<>setpagedevice" -*CloseUI: *MediaType -*OpenUI *ColorModel/Farbmodus: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*ColorModel Gray/Graustufen: "<>setpagedevice" -*ColorModel RGB/Farbe: "<>setpagedevice" -*DefaultColorModel: RGB -*CloseUI: *ColorModel -*OpenUI *Duplex/Doppelseitig drucken: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Aus (Einseitig): "<>setpagedevice" -*Duplex DuplexNoTumble/Lange Kante (Hochformat): "<>setpagedevice" -*Duplex DuplexTumble/Kurze Kante (Querformat): "<>setpagedevice" -*CloseUI: *Duplex -*cupsBackSide: Normal -*DefaultResolution: 600dpi -*OpenUI *cupsPrintQuality/Druckqualität: PickOne -*OrderDependency: 10 AnySetup *cupsPrintQuality -*DefaultcupsPrintQuality: Normal -*cupsPrintQuality Draft/Entwurf: "<>setpagedevice" -*cupsPrintQuality Normal/Normal: "<>setpagedevice" -*CloseUI: *cupsPrintQuality diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O deleted file mode 100644 index ea78f210..00000000 --- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O +++ /dev/null @@ -1,188 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "2.2" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "ippeve.ppd" -*Manufacturer: "HP" -*ModelName: "Color LaserJet MFP M277dw" -*Product: "(Color LaserJet MFP M277dw)" -*NickName: "Color LaserJet MFP M277dw" -*ShortNickName: "Color LaserJet MFP M277dw" -*ColorDevice: True -*cupsVersion: 2.2 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*cupsFilter2: "image/jpeg image/jpeg 0 -" -*cupsFilter2: "application/vnd.cups-pdf application/pdf 10 -" -*cupsFilter2: "image/urf image/urf 100 -" -*OpenUI *PageSize: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize Letter: "<>setpagedevice" -*PageSize Legal: "<>setpagedevice" -*PageSize Executive: "<>setpagedevice" -*PageSize FanFoldGermanLegal: "<>setpagedevice" -*PageSize Oficio: "<>setpagedevice" -*PageSize 4x6: "<>setpagedevice" -*PageSize 5x8: "<>setpagedevice" -*PageSize A4: "<>setpagedevice" -*PageSize A5: "<>setpagedevice" -*PageSize A6: "<>setpagedevice" -*PageSize B5: "<>setpagedevice" -*PageSize B6: "<>setpagedevice" -*PageSize 100x150mm: "<>setpagedevice" -*PageSize 195x270mm: "<>setpagedevice" -*PageSize 184x260mm: "<>setpagedevice" -*PageSize roc16k: "<>setpagedevice" -*PageSize Postcard: "<>setpagedevice" -*PageSize DoublePostcardRotated: "<>setpagedevice" -*PageSize Env10: "<>setpagedevice" -*PageSize EnvMonarch: "<>setpagedevice" -*PageSize ISOB5: "<>setpagedevice" -*PageSize EnvC5: "<>setpagedevice" -*PageSize EnvDL: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion Letter: "<>setpagedevice" -*PageRegion Legal: "<>setpagedevice" -*PageRegion Executive: "<>setpagedevice" -*PageRegion FanFoldGermanLegal: "<>setpagedevice" -*PageRegion Oficio: "<>setpagedevice" -*PageRegion 4x6: "<>setpagedevice" -*PageRegion 5x8: "<>setpagedevice" -*PageRegion A4: "<>setpagedevice" -*PageRegion A5: "<>setpagedevice" -*PageRegion A6: "<>setpagedevice" -*PageRegion B5: "<>setpagedevice" -*PageRegion B6: "<>setpagedevice" -*PageRegion 100x150mm: "<>setpagedevice" -*PageRegion 195x270mm: "<>setpagedevice" -*PageRegion 184x260mm: "<>setpagedevice" -*PageRegion roc16k: "<>setpagedevice" -*PageRegion Postcard: "<>setpagedevice" -*PageRegion DoublePostcardRotated: "<>setpagedevice" -*PageRegion Env10: "<>setpagedevice" -*PageRegion EnvMonarch: "<>setpagedevice" -*PageRegion ISOB5: "<>setpagedevice" -*PageRegion EnvC5: "<>setpagedevice" -*PageRegion EnvDL: "<>setpagedevice" -*CloseUI: *PageRegion -*DefaultImageableArea: A4 -*DefaultPaperDimension: A4 -*ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898" -*PaperDimension Letter: "612 792" -*ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898" -*PaperDimension Legal: "612 1008" -*ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898" -*PaperDimension Executive: "522 756" -*ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898" -*PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" -*PaperDimension Oficio: "612 964.8" -*ImageableArea 4x6: "11.990551181102 11.990551181102 276.009448818898 420.009448818898" -*PaperDimension 4x6: "288 432" -*ImageableArea 5x8: "11.990551181102 11.990551181102 348.009448818898 564.009448818898" -*PaperDimension 5x8: "360 576" -*ImageableArea A4: "11.990551181102 11.990551181102 583.285039370079 829.899212598425" -*PaperDimension A4: "595.275590551181 841.889763779528" -*ImageableArea A5: "11.990551181102 11.990551181102 407.537007874016 583.285039370079" -*PaperDimension A5: "419.527559055118 595.275590551181" -*ImageableArea A6: "11.990551181102 11.990551181102 285.647244094488 407.537007874016" -*PaperDimension A6: "297.637795275591 419.527559055118" -*ImageableArea B5: "11.990551181102 11.990551181102 503.914960629921 716.513385826772" -*PaperDimension B5: "515.905511811024 728.503937007874" -*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921" -*PaperDimension B6: "362.834645669291 515.905511811024" -*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598" -*PaperDimension 100x150mm: "283.464566929134 425.196850393701" -*ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559" -*PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646" -*PaperDimension 184x260mm: "521.574803149606 737.007874015748" -*ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898" -*PaperDimension roc16k: "558 774" -*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016" -*PaperDimension Postcard: "283.464566929134 419.527559055118" -*ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165" -*PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268" -*ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898" -*PaperDimension Env10: "296.985826771654 684" -*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898" -*PaperDimension EnvMonarch: "278.985826771654 540" -*ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732" -*PaperDimension ISOB5: "498.897637795276 708.661417322835" -*ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614" -*PaperDimension EnvC5: "459.212598425197 649.133858267717" -*ImageableArea EnvDL: "11.990551181102 11.990551181102 299.820472440945 611.631496062992" -*PaperDimension EnvDL: "311.811023622047 623.622047244094" -*OpenUI *InputSlot: PickOne -*OrderDependency: 10 AnySetup *InputSlot -*DefaultInputSlot: Auto -*InputSlot Auto/Automatic: "<>setpagedevice" -*InputSlot Manual/Manual: "<>setpagedevice" -*InputSlot Tray1/Fach 1: "<>setpagedevice" -*InputSlot Tray2/Fach 2: "<>setpagedevice" -*CloseUI: *InputSlot -*OpenUI *MediaType: PickOne -*OrderDependency: 10 AnySetup *MediaType -*DefaultMediaType: HPMatte90gsm -*MediaType Stationery/Standardpapier: "<>setpagedevice" -*MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" -*MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" -*MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" -*MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" -*MediaType HPCover/HPCover: "<>setpagedevice" -*MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" -*MediaType PhotographicGlossy/Fotoglanzpapier: "<>setpagedevice" -*MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" -*MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" -*MediaType StationeryLightweight/Lightweight Paper: "<>setpagedevice" -*MediaType ExtraLight/extraLight: "<>setpagedevice" -*MediaType Intermediate/intermediate: "<>setpagedevice" -*MediaType Midweight/midweight: "<>setpagedevice" -*MediaType StationeryHeavyweight/Schweres Papier: "<>setpagedevice" -*MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" -*MediaType PhotographicHighGloss/Hochglanzfotopapier: "<>setpagedevice" -*MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" -*MediaType CardGlossy/cardGlossy: "<>setpagedevice" -*MediaType Transparency/Transparenz: "<>setpagedevice" -*MediaType Labels/Etiketten: "<>setpagedevice" -*MediaType StationeryLetterhead/Briefkopf: "<>setpagedevice" -*MediaType Envelope/Umschlag: "<>setpagedevice" -*MediaType EnvelopeHeavyweight/Schwerer Umschlag: "<>setpagedevice" -*MediaType StationeryPreprinted/Vorbedrucktes Papier: "<>setpagedevice" -*MediaType StationeryPrepunched/Gelochtes Papier: "<>setpagedevice" -*MediaType StationeryColored/stationery-colored: "<>setpagedevice" -*MediaType StationeryBond/stationery-bond: "<>setpagedevice" -*MediaType Recycled/recycled: "<>setpagedevice" -*MediaType Rough/rough: "<>setpagedevice" -*MediaType HeavyRough/heavyRough: "<>setpagedevice" -*MediaType PhotographicFilm/Fotofilm: "<>setpagedevice" -*CloseUI: *MediaType -*OpenUI *ColorModel/Farbmodus: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*ColorModel Gray/Graustufen: "<>setpagedevice" -*ColorModel RGB/Farbe: "<>setpagedevice" -*DefaultColorModel: RGB -*CloseUI: *ColorModel -*OpenUI *Duplex/Doppelseitig drucken: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Aus (Einseitig): "<>setpagedevice" -*Duplex DuplexNoTumble/Lange Kante (Hochformat): "<>setpagedevice" -*Duplex DuplexTumble/Kurze Kante (Querformat): "<>setpagedevice" -*CloseUI: *Duplex -*cupsBackSide: Normal -*DefaultResolution: 600dpi -*OpenUI *cupsPrintQuality/Druckqualität: PickOne -*OrderDependency: 10 AnySetup *cupsPrintQuality -*DefaultcupsPrintQuality: Normal -*cupsPrintQuality Draft/Entwurf: "<>setpagedevice" -*cupsPrintQuality Normal/Normal: "<>setpagedevice" -*CloseUI: *cupsPrintQuality diff --git a/cups/printers.conf b/cups/printers.conf index eff97d63..ce86cb78 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,23 +1,3 @@ # Printer configuration file for CUPS v2.2.7 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING - -UUID urn:uuid:ea93d50c-2e22-3178-58fc-95b888afac54 -Info -Location -MakeModel Color LaserJet MFP M277dw -DeviceURI ipp://NPI9D0E59.local:631/ipp/print -State Idle -StateTime 1642547575 -ConfigTime 1642547578 -Type 4188 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true - diff --git a/cups/printers.conf.O b/cups/printers.conf.O index ce86cb78..eff97d63 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,3 +1,23 @@ # Printer configuration file for CUPS v2.2.7 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING + +UUID urn:uuid:ea93d50c-2e22-3178-58fc-95b888afac54 +Info +Location +MakeModel Color LaserJet MFP M277dw +DeviceURI ipp://NPI9D0E59.local:631/ipp/print +State Idle +StateTime 1642547575 +ConfigTime 1642547578 +Type 4188 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + diff --git a/letsencrypt/csr/3212_csr-certbot.pem b/letsencrypt/csr/3212_csr-certbot.pem new file mode 100644 index 00000000..17b722fb --- /dev/null +++ b/letsencrypt/csr/3212_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANI+ +H4+Dgq/G+3eoKSlwz7W1UjDG+mhD9X/lJlL4JFS17CVDMPhufiy4+OUr1O3V8iu9 +S+nbM3oUkKX24FUc0fKHKyCPiwbfEzrXeJsMl4kT1IDJpkEdv7AHmM+B4ov9XEC8 +nz2URvdJ/l1VKM8fsmEdA3s4yQaKgD6e9o3KsngNBKoXJCeW1cNefn/1eZrElHJm +vx+Q4uofpRis201Rwf9zFlQnWbsZ5+C0fMdYqvFGP65+thlMURpJfygxQjlmnrvv +EWIJIFp1kiRoalcrHojacOBv3pVXniUYLd2Xcn0RpblJ0Ca4UmyToxed3Zpv0QY8 +iQHQYhVJJvsLaTrTbKkCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQBKPlwNbxN4 +Ih+vefCWTxIoAiAQfgGkyykehjuSo+AKs5/KxHAVwpIku+ybgUV4NsnI3wXhaSsr +ELZiXBR04MdcQVQNZp011vh/ZLdJ4b8qXu7Gl4ztU8SZPaE5u7Y2ZPyYlAtWueGn +zMYkqQxuD7nvwKhKmajyHp9Fy9yAqh8FnMfErocPLbf3sl1t+N/FaPJgMCxINiT5 +EaJb5YlUIZOwqLd6hP9DrnwSFmOaWMrVZcyJ8ei2QH1GuTniG1WalkyCeW4wPvOH +RTdwLjXsH59+bfqZwJkLAEYXSRQjyp6hOlBS+6VEEjaF4XFsoBIhP2BLSPXb2Pn3 ++8TrSb7FXn3x +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3213_key-certbot.pem b/letsencrypt/keys/3213_key-certbot.pem new file mode 100644 index 00000000..f62bed42 --- /dev/null +++ b/letsencrypt/keys/3213_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSPh+Pg4Kvxvt3 +qCkpcM+1tVIwxvpoQ/V/5SZS+CRUtewlQzD4bn4suPjlK9Tt1fIrvUvp2zN6FJCl +9uBVHNHyhysgj4sG3xM613ibDJeJE9SAyaZBHb+wB5jPgeKL/VxAvJ89lEb3Sf5d +VSjPH7JhHQN7OMkGioA+nvaNyrJ4DQSqFyQnltXDXn5/9XmaxJRyZr8fkOLqH6UY +rNtNUcH/cxZUJ1m7GefgtHzHWKrxRj+ufrYZTFEaSX8oMUI5Zp677xFiCSBadZIk +aGpXKx6I2nDgb96VV54lGC3dl3J9EaW5SdAmuFJsk6MXnd2ab9EGPIkB0GIVSSb7 +C2k602ypAgMBAAECggEBALYoGRQw73P4xTvhOPisw2o+VZ3paGAaMYTEN7Y/RMsY +bCfE1ZMJuMxq30s/9Na0PYRkGHff8fPeCY2iHq/fro+hSV6GwAAOGw0qT1aXTFv6 +EG4dSKy2Z7TOgDmZ4X1E4T89rgKei/YJ6BdZh2gdoGG/z5pdkt7V9VNMS3aCnqqf +mq4/I0uaGMV8oybaiwH8P5lyKsaqlFPGnM/qTQmg8PKw+WCo7DH+AW9KgTbqXv7s +fLoY72UjADmZ3LmmBmwcFPiWfjhy54OpYDsHEhE91U+SHH6jWwWC3Zk+x+zIX0mN +AKvNCT13Bchc7ZP/qDuAF/n55kipXs3plFKELRVQjmECgYEA7yBOgRlpz3PgSu3w +ztR0wEnnq8BJrQjfdSPWlPaTUut1TR7luOwmj8IYlyWNEyOVu99w3PKabFHnvuAS +d2UUsYfIo5/S5LTq268krK4z0FADvDioV91hOcaVtjGS/SwawbmXyeJoQHTosKgN +AEJXoczO0T6YWenbqF0sTDlJLcUCgYEA4RQM42NOvMCPH5UFshXDciLqfAcvgB1h +ZzEZ6mJnI2aKs9JNlvwdkrlNzIpcs/m/pZoG6FE8K96eAoW6y0njwLFsxnjanKzn +mMNx1J2h1yo+LL+oLQXutrF/9ul3bteqzf5s4wteni8FAizaXFVg/6aPqloS6Vyq +4YFLaufaNZUCgYEA2uetVjvIhHQkwRNfnkgZ9Sny3mTyTWhRADBlsQqlRYRtZsNB +M29jwbjCwCNNKVcrLMjYzjt9KGo2h6Mi5I/xSK/v+fJGor4IPkHwhfAXWLzXHoiT +e5Qa/EQSK67oS8IDYJMhJFySaWdc2NOOy0zwYhtWvXDbEXynbFKXSdQrbK0CgYEA +hqCXlOsxjXUgJqPcZEjgPsTjvIwPvXHVcQPNnIR/bI1JKYYBIu5qQfjUsCOSj5Qz +LbqTpyHv+82MdbXHpRDtSbTWe2COYmiJnrZIwAQJacm6psl8rnF994j0IZxD8+jM +IaqtNqD2V2eId2Sct93ZxxC5nguChFMJYxkTIz7LJoECgYARfMMD8g83c4Fmhtde +WTHXSpDiIyYy6VmSW9t5gpBISAZ69sA7a2zf3M9xOfL4Ij5gFesKiMgbbx1pNtEB +qtpR4EbbKCjdqxrMlJLoqe9hSL812ET9RR6Gka3421V48+afY2Tg6qpMfN620O1/ +WwEdpR7rFXVBbniYK5xbhhjItg== +-----END PRIVATE KEY----- diff --git a/lvm/backup/system b/lvm/backup/system index 23b580e2..b2cb93e5 100644 --- a/lvm/backup/system +++ b/lvm/backup/system @@ -1,16 +1,16 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Jan 20 00:00:02 2022 +# Generated by LVM2 version 2.02.176(2) (2017-11-03): Thu Jan 20 00:19:45 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 = 1642633202 # Thu Jan 20 00:00:02 2022 +creation_time = 1642634385 # Thu Jan 20 00:19:45 2022 system { id = "5WJluU-PUGx-m4Am-4B5T-wooB-NUG3-dZj5zv" - seqno = 124 + seqno = 130 format = "lvm2" # informational status = ["RESIZEABLE", "READ", "WRITE"] flags = [] @@ -129,126 +129,6 @@ system { ] } } - - root_backup { - id = "8ZVGXT-Bwnz-wNv1-JPlq-ed6a-po8P-PZtCz8" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1642633201 # 2022-01-20 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 = "iF0OIe-e7Uo-5Fid-dyxr-6QkX-7GEd-F1nbLl" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1642633202 # 2022-01-20 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 = "q7cyRH-bcET-7lgS-w3jQ-2ZdH-dskO-I9zjJq" - status = ["READ", "WRITE"] - flags = [] - creation_time = 1642633202 # 2022-01-20 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 = "Yl6Y8v-1tG2-AjpL-aVi3-TTOI-qTFs-rMBBPv" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1642633201 # 2022-01-20 00:00:01 +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 = "HSvT0q-Wo0s-Tn6V-5p8V-Qsa5-yelT-SBkaZ3" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1642633202 # 2022-01-20 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 = "Y5muFv-L66s-2Z9d-jQXA-4XyH-ZclF-wfNZ8a" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1642633202 # 2022-01-20 00:00:02 +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" - } - } } } -- 2.43.0