From: root Date: Thu, 1 Oct 2020 17:34:54 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=6c87faa2551f1a4870cecb7aec0170c70764be8f;p=zenbook saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 7edb315..ef60aa2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1501,10 +1501,6 @@ maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O' maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O' maybe chgrp 'lp' 'cups/ppd/hp8.ppd' maybe chmod 0640 'cups/ppd/hp8.ppd' -maybe chgrp 'lp' 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd' -maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd' -maybe chgrp 'lp' 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd.O' -maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd.O' maybe chgrp 'lp' 'cups/printers.conf.O' maybe chmod 0600 'cups/printers.conf.O' maybe chmod 0644 'cups/raw.convs' diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd deleted file mode 100644 index bfe3ed1..0000000 --- a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd +++ /dev/null @@ -1,100 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "1.27.4" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "drvless.ppd" -*Manufacturer: "hp" -*ModelName: "hp LaserJet 9040" -*Product: "(hp LaserJet 9040)" -*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4" -*ShortNickName: "hp LaserJet 9040" -*DefaultOutputOrder: Normal -*ColorDevice: True -*cupsVersion: 2.3 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -" -*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx" -*% Printer did not supply page size info via IPP, using defaults -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: Letter -*PageSize Letter/US Letter: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize Tabloid/Tabloid: "<>setpagedevice" -*PageSize A3/A3: "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/JIS B5: "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize Env10/Envelope #10 : "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Letter -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion Tabloid/Tabloid: "<>setpagedevice" -*PageRegion A3/A3: "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/JIS B5: "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion Env10/Envelope #10 : "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*DefaultImageableArea: Letter -*ImageableArea Letter/US Letter: "18 12 594 780" -*ImageableArea Legal/US Legal: "18 12 594 996" -*ImageableArea Executive/Executive: "18 12 504 744" -*ImageableArea Tabloid/Tabloid: "18 12 774 1212" -*ImageableArea A3/A3: "18 12 824 1179" -*ImageableArea A4/A4: "18 12 577 830" -*ImageableArea A5/A5: "18 12 402 583" -*ImageableArea B5/JIS B5: "18 12 498 717" -*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697" -*ImageableArea Env10/Envelope #10 : "18 12 279 672" -*ImageableArea EnvC5/Envelope C5: "18 12 441 637" -*ImageableArea EnvDL/Envelope DL: "18 12 294 612" -*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528" -*DefaultPaperDimension: Letter -*PaperDimension Letter/US Letter: "612 792" -*PaperDimension Legal/US Legal: "612 1008" -*PaperDimension Executive/Executive: "522 756" -*PaperDimension Tabloid/Tabloid: "792 1224" -*PaperDimension A3/A3: "842 1191" -*PaperDimension A4/A4: "595 842" -*PaperDimension A5/A5: "420 595" -*PaperDimension B5/JIS B5: "516 729" -*PaperDimension EnvISOB5/Envelope B5: "499 709" -*PaperDimension Env10/Envelope #10 : "297 684" -*PaperDimension EnvC5/Envelope C5: "459 649" -*PaperDimension EnvDL/Envelope DL: "312 624" -*PaperDimension EnvMonarch/Envelope Monarch: "279 540" -*OpenUI *ColorModel/Print Color Mode: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*DefaultColorModel: Gray -*ColorModel FastGray/Fast Grayscale: "<>setpagedevice" -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" -*CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Off: "<>setpagedevice" -*Duplex DuplexNoTumble/On (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/On (Landscape): "<>setpagedevice" -*CloseUI: *Duplex -*DefaultResolution: 300dpi -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd.O b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd.O deleted file mode 100644 index bfe3ed1..0000000 --- a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd.O +++ /dev/null @@ -1,100 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "1.27.4" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "drvless.ppd" -*Manufacturer: "hp" -*ModelName: "hp LaserJet 9040" -*Product: "(hp LaserJet 9040)" -*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4" -*ShortNickName: "hp LaserJet 9040" -*DefaultOutputOrder: Normal -*ColorDevice: True -*cupsVersion: 2.3 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -" -*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx" -*% Printer did not supply page size info via IPP, using defaults -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: Letter -*PageSize Letter/US Letter: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize Tabloid/Tabloid: "<>setpagedevice" -*PageSize A3/A3: "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/JIS B5: "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize Env10/Envelope #10 : "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Letter -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion Tabloid/Tabloid: "<>setpagedevice" -*PageRegion A3/A3: "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/JIS B5: "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion Env10/Envelope #10 : "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize -*DefaultImageableArea: Letter -*ImageableArea Letter/US Letter: "18 12 594 780" -*ImageableArea Legal/US Legal: "18 12 594 996" -*ImageableArea Executive/Executive: "18 12 504 744" -*ImageableArea Tabloid/Tabloid: "18 12 774 1212" -*ImageableArea A3/A3: "18 12 824 1179" -*ImageableArea A4/A4: "18 12 577 830" -*ImageableArea A5/A5: "18 12 402 583" -*ImageableArea B5/JIS B5: "18 12 498 717" -*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697" -*ImageableArea Env10/Envelope #10 : "18 12 279 672" -*ImageableArea EnvC5/Envelope C5: "18 12 441 637" -*ImageableArea EnvDL/Envelope DL: "18 12 294 612" -*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528" -*DefaultPaperDimension: Letter -*PaperDimension Letter/US Letter: "612 792" -*PaperDimension Legal/US Legal: "612 1008" -*PaperDimension Executive/Executive: "522 756" -*PaperDimension Tabloid/Tabloid: "792 1224" -*PaperDimension A3/A3: "842 1191" -*PaperDimension A4/A4: "595 842" -*PaperDimension A5/A5: "420 595" -*PaperDimension B5/JIS B5: "516 729" -*PaperDimension EnvISOB5/Envelope B5: "499 709" -*PaperDimension Env10/Envelope #10 : "297 684" -*PaperDimension EnvC5/Envelope C5: "459 649" -*PaperDimension EnvDL/Envelope DL: "312 624" -*PaperDimension EnvMonarch/Envelope Monarch: "279 540" -*OpenUI *ColorModel/Print Color Mode: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*DefaultColorModel: Gray -*ColorModel FastGray/Fast Grayscale: "<>setpagedevice" -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" -*CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Off: "<>setpagedevice" -*Duplex DuplexNoTumble/On (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/On (Landscape): "<>setpagedevice" -*CloseUI: *Duplex -*DefaultResolution: 300dpi -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/printers.conf.O b/cups/printers.conf.O index e7e193f..71d67c7 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,7 +1,7 @@ # Printer configuration file for CUPS v2.3.1 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -NextPrinterId 163 +NextPrinterId 164 PrinterId 1 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061 @@ -97,6 +97,27 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job + +PrinterId 163 +UUID urn:uuid:cb4f7bd0-2a95-31da-59c5-5f41141de9fd +Info +Location +MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4 +DeviceURI implicitclass://hp8/ +State Idle +StateTime 1601533330 +ConfigTime 1601533330 +Type 8400988 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + PrinterId 162 UUID urn:uuid:b1c78ded-6eea-3ec1-4942-5345950f8181 @@ -106,7 +127,7 @@ MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4 DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/ State Idle StateTime 1601532925 -ConfigTime 1601532925 +ConfigTime 1601533329 Type 8400988 Accepting Yes Shared No diff --git a/ssh/sshd_config b/ssh/sshd_config index dc0db57..45cfb59 100644 --- a/ssh/sshd_config +++ b/ssh/sshd_config @@ -31,7 +31,7 @@ Include /etc/ssh/sshd_config.d/*.conf # Authentication: #LoginGraceTime 2m -#PermitRootLogin prohibit-password +PermitRootLogin yes #StrictModes yes #MaxAuthTries 6 #MaxSessions 10