From: mhoellein Date: Tue, 11 Jan 2022 23:11:00 +0000 (+0100) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=76fcd2071c499496e30daf7beb58cb4b7cdafe2d;p=homeserver daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 6339a7a1..56ded084 100755 --- a/.etckeeper +++ b/.etckeeper @@ -711,7 +711,6 @@ maybe chmod 0644 'apparmor.d/tunables/alias' maybe chmod 0644 'apparmor.d/tunables/apparmorfs' maybe chmod 0644 'apparmor.d/tunables/dovecot' maybe chmod 0644 'apparmor.d/tunables/global' -maybe chmod 0644 'apparmor.d/tunables/home' maybe chmod 0755 'apparmor.d/tunables/home.d' maybe chmod 0644 'apparmor.d/tunables/home.d/site.local' maybe chmod 0644 'apparmor.d/tunables/home.d/ubuntu' @@ -720,9 +719,7 @@ maybe chmod 0644 'apparmor.d/tunables/multiarch' maybe chmod 0755 'apparmor.d/tunables/multiarch.d' maybe chmod 0644 'apparmor.d/tunables/multiarch.d/site.local' maybe chmod 0644 'apparmor.d/tunables/ntpd' -maybe chmod 0644 'apparmor.d/tunables/proc' maybe chmod 0644 'apparmor.d/tunables/securityfs' -maybe chmod 0644 'apparmor.d/tunables/sys' maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs' maybe chmod 0755 'apparmor.d/tunables/xdg-user-dirs.d' maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs.d/site.local' @@ -2101,6 +2098,10 @@ 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' @@ -7327,6 +7328,7 @@ maybe chmod 0644 'letsencrypt/csr/3185_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3186_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3187_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3188_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3189_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' @@ -10518,6 +10520,7 @@ maybe chmod 0600 'letsencrypt/keys/3186_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3187_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3188_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3189_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3190_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' @@ -10682,7 +10685,6 @@ maybe chmod 0755 'lvm' maybe chmod 0700 'lvm/archive' maybe chmod 0700 'lvm/backup' maybe chmod 0600 'lvm/backup/VG-sda1' -maybe chmod 0600 'lvm/backup/mint-vg' maybe chmod 0600 'lvm/backup/system' maybe chmod 0644 'lvm/lvm.conf' maybe chmod 0644 'lvm/lvmlocal.conf' diff --git a/apparmor.d/tunables/home b/apparmor.d/tunables/home deleted file mode 100644 index 550ccd5d..00000000 --- a/apparmor.d/tunables/home +++ /dev/null @@ -1,25 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2006-2009 Novell/SUSE -# Copyright (C) 2010 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - -# @{HOME} is a space-separated list of all user home directories. While -# it doesn't refer to a specific home directory (AppArmor doesn't -# enforce discretionary access controls) it can be used as if it did -# refer to a specific home directory -@{HOME}=@{HOMEDIRS}/*/ /root/ - -# @{HOMEDIRS} is a space-separated list of where user home directories -# are stored, for programs that must enumerate all home directories on a -# system. -@{HOMEDIRS}=/home/ - -# Also, include files in tunables/home.d for site-specific adjustments to -# @{HOMEDIRS}. -#include diff --git a/apparmor.d/tunables/proc b/apparmor.d/tunables/proc deleted file mode 100644 index 25a1964d..00000000 --- a/apparmor.d/tunables/proc +++ /dev/null @@ -1,12 +0,0 @@ -# ------------------------------------------------------------------ -# -# Copyright (C) 2006 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - -# @{PROC} is the location where procfs is mounted. -@{PROC}=/proc/ diff --git a/apparmor.d/tunables/sys b/apparmor.d/tunables/sys deleted file mode 100644 index e49702cb..00000000 --- a/apparmor.d/tunables/sys +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012 Canonical Ltd. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - -# @{sys} is the location where sysfs is mounted. -@{sys}=/sys/ diff --git a/crypttab b/crypttab index 45b78006..dddf7122 100644 --- a/crypttab +++ b/crypttab @@ -1,3 +1,3 @@ -mmcblk0p3_crypt UUID=d190e6dc-37be-42dd-a9e0-7dd88dced9f3 none luks,discard -sda1_crypt UUID=86b596f5-7e7e-438d-87a6-02685618d15c /root/etc/keyfile_sda1 luks,discard +sda1_crypt UUID=86b596f5-7e7e-438d-87a6-02685618d15c none luks,discard +mmcblk0p3_crypt UUID=d190e6dc-37be-42dd-a9e0-7dd88dced9f3 /root/etc/keyfile_mmcblk0 luks,discard backup_crypt UUID=7030a54c-fbc4-40f3-acff-f253c5e89f4e /root/etc/keyfile_backup luks,discard diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd new file mode 100644 index 00000000..ea78f210 --- /dev/null +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd @@ -0,0 +1,188 @@ +*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 new file mode 100644 index 00000000..ea78f210 --- /dev/null +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O @@ -0,0 +1,188 @@ +*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 ce86cb78..6bf2df96 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -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:3456acf3-57d6-3c65-5918-fb9991f0c522 +Info +Location +MakeModel Color LaserJet MFP M277dw +DeviceURI ipp://NPI9D0E59.local:631/ipp/print +State Idle +StateTime 1641903384 +ConfigTime 1641903387 +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 134382b3..ce86cb78 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -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:ef1a9a64-15ed-3a25-778a-236b1b7795da -Info -Location -MakeModel Color LaserJet MFP M277dw -DeviceURI ipp://NPI9D0E59.local:631/ipp/print -State Idle -StateTime 1641769942 -ConfigTime 1641769945 -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/default/smartmontools b/default/smartmontools index 6cbd2899..d884cd0a 100644 --- a/default/smartmontools +++ b/default/smartmontools @@ -6,7 +6,7 @@ #enable_smart="/dev/hda /dev/hdb" # uncomment to start smartd on system startup -#start_smartd=yes +start_smartd=yes # uncomment to pass additional options to smartd on startup #smartd_opts="--interval=1800" diff --git a/fstab b/fstab index 6f72d90c..134d24d5 100644 --- a/fstab +++ b/fstab @@ -5,12 +5,16 @@ # that works even if disks are added and removed. See fstab(5). # # -/dev/mapper/mint--vg-root / ext4 errors=remount-ro 0 1 +#/dev/mapper/mint--vg-root / ext4 errors=remount-ro 0 1 +UUID=46d312df-fa34-44dd-89d7-ba808ffa1233 / ext4 errors=remount-ro 0 1 +UUID=fa5ed7da-8d1b-421a-b349-647378ec5d12 /var ext4 errors=remount-ro 0 1 # /boot was on /dev/mmcblk0p2 during installation UUID=c068c27c-2744-4e90-8b4b-b60ce9363a87 /boot ext4 defaults 0 2 # /boot/efi was on /dev/mmcblk0p1 during installation UUID=B853-DB86 /boot/efi vfat umask=0077 0 1 -/dev/mapper/mint--vg-swap_1 none swap sw 0 0 +#/dev/mapper/mint--vg-swap_1 none swap sw 0 0 +UUID=f458da19-8657-4e0f-8354-91ecc48ae8f2 none swap sw 0 0 /dev/mapper/backup_crypt /backup ext4 errors=remount-ro 0 1 #/dev/mapper/VG--sda1-backup /backup ext4 errors=remount-ro 0 1 -/dev/mapper/VG--sda1-home /home_sda ext4 errors=remount-ro 0 1 +#/dev/mapper/VG--sda1-home /home_sda ext4 errors=remount-ro 0 1 +UUID=d1becb36-3785-424f-a619-c10af14f9598 /home ext4 errors=remount-ro 0 1 diff --git a/letsencrypt/csr/3189_csr-certbot.pem b/letsencrypt/csr/3189_csr-certbot.pem new file mode 100644 index 00000000..d2c5f41d --- /dev/null +++ b/letsencrypt/csr/3189_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLD +HuoA6tA316ldh3S9peg5LzY5YuFx0oyuCZUQA0qCByWT1FdzdlR59nQMhKXJHBiE +3QTjRVCOsIeV9bcd+WbCNN3EmVs0EnMl7kKjiPYpjrLhCQA/CV0SYIu0hBQkCz0V +Mljm/044vPH2rD9XfKPLqt135GataY/Xxfsky7RnYjXuQ39nMNzLZgee8pIlCmQS +DAlOc3HYCrc23Bc526YaukZFMiTtXxR/6Oyy/zUwMeyvy6SpLuKddSU0xhsjdIt5 +wLHu2XFwaCcd+lp/pP24E4b7+y0JKQGZHiSOL5P0SqYAi1jX2bLnh3tiw7Qsj4Rf +cY1qEOcDujG/mTti3vMCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCvKx/vNgr+ +parCMSmL3WyUG4zkskzW2V3gsnNNQrd/rfgRu6dnLVXzrYgS8bXFHk7qn8MltuaM +609ot35/8wyK1aKGcmfA5VpX+wtfgvEqh4ghIi7Don4g6AeIp8QjLD5FaRfoUUGL +LjjUkCO5WCuV8B2yTv/MT4u6fNqauLbfqB7SZzyzb/TiKZ6c+RXqoTogF1bFYS+s +SErOxFI5reuK+CyiK6LYWa1+Ny34lUBcfZ2SiwqSw7/qda3Y8lMrVYasnnJB+Pd6 +YUFwcuiFpJrTcaOhARN9tk6SYf72Z14A0fkZ0DW4zAfEDgze0fBxphWQr44CdYMs +OU3Zla1ddwfr +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3190_key-certbot.pem b/letsencrypt/keys/3190_key-certbot.pem new file mode 100644 index 00000000..ba41ec3d --- /dev/null +++ b/letsencrypt/keys/3190_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCwx7qAOrQN9ep +XYd0vaXoOS82OWLhcdKMrgmVEANKggclk9RXc3ZUefZ0DISlyRwYhN0E40VQjrCH +lfW3HflmwjTdxJlbNBJzJe5Co4j2KY6y4QkAPwldEmCLtIQUJAs9FTJY5v9OOLzx +9qw/V3yjy6rdd+RmrWmP18X7JMu0Z2I17kN/ZzDcy2YHnvKSJQpkEgwJTnNx2Aq3 +NtwXOdumGrpGRTIk7V8Uf+jssv81MDHsr8ukqS7inXUlNMYbI3SLecCx7tlxcGgn +Hfpaf6T9uBOG+/stCSkBmR4kji+T9EqmAItY19my54d7YsO0LI+EX3GNahDnA7ox +v5k7Yt7zAgMBAAECggEAIr8EyOKZAcS0qPaSr/UVoDRzg80BIw9XbNmvw/QzYhuI +gt+4xlFHDxMjMNj64UjbxlQNyk1xlEmgnM/YIm8qi3aiT94/LdJAaGKf+yuJx8Dq +QGd9X5nfZcddig8OcTls99zMOqgbbC0bKF/FoxdMmTxAo3o8OUU+y/bGz2NlJC3t +0Wg7dSewF+BuYcnpqr1utx6XPCgmMpIoCDKtPqPrZbYeYJXla4zu3/rD2EYJ9m7s +b0ljSF6wgj0G+YqOdl0puIVI1Sc+5Dst7K4nFnz1CRm2epHnDG73oh99dyB5yxmh +1dh7ar0FtJfaLgTHqgC1FK5ES3nPgV4R3th24bOvwQKBgQDnq6e/CoE11olnCJEG +irK6j7LZriG4FdJwyd+1daWs6L0lxVKbNF4prANUX0/ML7768NtIiW0cAuAOKQqZ +989MK7ddP2z9EI/Ju/MEqBerNxqTmpMlWkM7Uoby90+sEwGI8WErAEI/naAewTil +sL8BZiAhyO9jlPpiXinJBUjPmwKBgQDXNzQbPb2qdY/k2TZ76SnDP+SedXZseg3z +u+Ki4U//74QzlGJ5ew+5jFvqlACfFhAzFO0Q8xRK59ntXbJcdnOY93jKY7ROghzq +RF4cvn3LOaMGytuIAAIu0gj7TNGK3qw7t7mJFqBG7uJeAFcCc7Lwh3JZoEMV0qir +iL1cu1gfiQKBgGV3qWDjGPSbolKeTeavmNhdV9g/jEU0SZdc076GaKnyxeVlJ2kS +5qsZy9uIY0rrHpqKI4EBr+g02i1ZjGsjPof+HbGZtgKg3lldGHNRrAwxdlJvwUL6 +5bd1zeVcrGiRanqwPf63fkyenSLbPhRT9VSHhktF1pOnDINI+sQwrFNBAoGBALiX +7OWAq3HNrEJJ3OWjM+L4posTjSO1/MmV2eqC/y8yrV3gZCZ2WyJ3NU+a6n2JWxO1 +WzEyjbFB9DYYK6gLIVOOz9godLrx9wMo6OAWs6bgJOjqjim0eCrYlEOXvBM0st31 +0/m1onu04gxmljrQKicMxhQB1gidy3Z1rpYfSpKhAoGBAJ3XiPnzzP/HHLrZOIXt +aFuZ0TPHojeXXDGkRA/uPZvDLhq9JKr0jItLnIs5WcVioX2LWUxaElpetRurF+AF +rb3ebPob97jwAo9QTRKIhtJhcYzEd+LoHJ9lufrqUeUJl9ZhIPOGG3JpS7rs0wsF +mWo+rLuUpdAEkUDZGheU52B/ +-----END PRIVATE KEY----- diff --git a/lvm/backup/mint-vg b/lvm/backup/mint-vg deleted file mode 100644 index 33d8038a..00000000 --- a/lvm/backup/mint-vg +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Sat Dec 4 08:37:59 2021 - -contents = "Text Format Volume Group" -version = 1 - -description = "Created *after* executing 'vgcfgbackup'" - -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 = 1638603479 # Sat Dec 4 08:37:59 2021 - -mint-vg { - id = "qZbl8d-AqAN-pxmk-JUsL-wMA5-uSlo-F4eYLd" - seqno = 3 - format = "lvm2" # informational - status = ["RESIZEABLE", "READ", "WRITE"] - flags = [] - extent_size = 8192 # 4 Megabytes - max_lv = 0 - max_pv = 0 - metadata_copies = 0 - - physical_volumes { - - pv0 { - id = "355J8J-P0WK-Ny8r-M7Ji-TP4g-G3NF-oGWroj" - device = "/dev/mapper/mmcblk0p3_crypt" # Hint only - - status = ["ALLOCATABLE"] - flags = [] - dev_size = 480772096 # 229,25 Gigabytes - pe_start = 2048 - pe_count = 58687 # 229,246 Gigabytes - } - } - - logical_volumes { - - root { - id = "DmT6PD-x2Lf-nkry-FRCl-4ZzN-VRdX-gAx1um" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1638558609 # 2021-12-03 20:10:09 +0100 - creation_host = "mint" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 56683 # 221,418 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 0 - ] - } - } - - swap_1 { - id = "f1FJI3-7tx1-Mcjl-P2wf-So3L-nALB-sgLbwM" - status = ["READ", "WRITE", "VISIBLE"] - flags = [] - creation_time = 1638558609 # 2021-12-03 20:10:09 +0100 - creation_host = "mint" - segment_count = 1 - - segment1 { - start_extent = 0 - extent_count = 2004 # 7,82812 Gigabytes - - type = "striped" - stripe_count = 1 # linear - - stripes = [ - "pv0", 56683 - ] - } - } - } - -} diff --git a/rc0.d/K01avahi-daemon b/rc0.d/K01avahi-daemon new file mode 120000 index 00000000..d28b3265 --- /dev/null +++ b/rc0.d/K01avahi-daemon @@ -0,0 +1 @@ +../init.d/avahi-daemon \ No newline at end of file diff --git a/rc1.d/K01avahi-daemon b/rc1.d/K01avahi-daemon new file mode 120000 index 00000000..d28b3265 --- /dev/null +++ b/rc1.d/K01avahi-daemon @@ -0,0 +1 @@ +../init.d/avahi-daemon \ No newline at end of file diff --git a/rc6.d/K01avahi-daemon b/rc6.d/K01avahi-daemon new file mode 120000 index 00000000..d28b3265 --- /dev/null +++ b/rc6.d/K01avahi-daemon @@ -0,0 +1 @@ +../init.d/avahi-daemon \ No newline at end of file diff --git a/smartd.conf b/smartd.conf index 4cdede75..3c4c7591 100644 --- a/smartd.conf +++ b/smartd.conf @@ -46,6 +46,7 @@ DEVICESCAN -d removable -n standby -m root -M exec /usr/share/smartmontools/smar # >= 45 Celsius and changes in Raw value of Reallocated_Sector_Ct (5). # Send mail on SMART failures or when Temperature is >= 55 Celsius. #/dev/sdc -a -I 194 -W 4,45,55 -R 5 -m admin@example.com +/dev/sda -a -I 194 -W 4,45,55 -R 5 -m root # An ATA disk may appear as a SCSI device to the OS. If a SCSI to # ATA Translation (SAT) layer is between the OS and the device then