saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 7edb315c25d96f41da777a9a988ae41df6dcc322..ef60aa2249041cfa8e4fe66535cead695f445b01 100755 (executable)
--- 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 (file)
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: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>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: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>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 (file)
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: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>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: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>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 e7e193f4e48c7dcffed5973d892e8763262b93fa..71d67c7caf0ba82a0f7f0440abf198ab9b7cd097 100644 (file)
--- 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
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,6 +97,27 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer hp8>
+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
+</Printer>
 <Printer hp_LaserJet_9040_8BFB3E_>
 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 dc0db5706a61b46fa356f236c087d76caa6b5d93..45cfb59efd99de86ad216d99a0b16d7ef4a8cdd4 100644 (file)
--- 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