Änderungen

diff --git a/.etckeeper b/.etckeeper
index a11d862981d0af747c0aa5d49410618340a9232a..a85498038301e8e65616edf24a05710681b97952 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1063,8 +1063,6 @@ maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O'
 maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O'
 maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd'
-maybe chgrp 'lp' 'cups/printers.conf'
-maybe chmod 0600 'cups/printers.conf'
 maybe chgrp 'lp' 'cups/printers.conf.O'
 maybe chmod 0600 'cups/printers.conf.O'
 maybe chmod 0644 'cups/raw.convs'

diff --git a/.gitignore b/.gitignore
index 9acd39a4ea668ce20ebf1173974ec34d6158a226..40ed4c6d52804d648ea0e1ca083af25b7b1c4de9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@ blkid.tab
 blkid.tab.old
 
 # some other files in /etc that typically do not need to be tracked
-cups/printers.conf.?
-cups/printers.conf
 nologin
 ld.so.cache
 prelink.cache
@@ -54,3 +52,5 @@ check_mk/logwatch.state
 DEADJOE
 
 # end section managed by etckeeper
+cups/printers.conf.?
+cups/printers.conf

diff --git a/console-setup/cached.kmap.gz b/console-setup/cached.kmap.gz
index abfc7fd9d8c7f5d100919b972420166776fd8ad6..2b96ae96d0838c0b5c5f53daf991b45b2aae964e 100644 (file)
Binary files a/console-setup/cached.kmap.gz and b/console-setup/cached.kmap.gz differ

diff --git a/cups/printers.conf b/cups/printers.conf
deleted file mode 100644 (file)
index 92931bc..0000000
--- a/cups/printers.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Printer configuration file for CUPS v2.1.3
-# Written by cupsd
-# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-<Printer ar-hp-HP-LaserJet-M806>
-UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
-Info HP LaserJet M806
-MakeModel HP LaserJet M806 Postscript (recommended)
-DeviceURI socket://172.17.6.105:9100
-State Idle
-StateTime 1526625198
-ConfigTime 1526624974
-Type 8433876
-Accepting Yes
-Shared Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-</Printer>
-<Printer HP-Color-LaserJet-MFP-M277dw>
-UUID urn:uuid:c09d676f-8b76-378b-697b-94d328051a32
-Info HP Color LaserJet MFP M277dw
-MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
-DeviceURI socket://192.168.178.254
-State Idle
-StateTime 1528748732
-ConfigTime 1496773872
-Type 8425500
-Accepting Yes
-Shared Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-</Printer>

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index c6eb5edba78893ce7a2bc6cb10780aff787a0878..da48bb35790883a0a33b081f62141afe660f2fa1 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -38,13 +38,13 @@ OpPolicy default
 ErrorPolicy retry-job
 </Printer>
 <Printer TEST>
-UUID urn:uuid:fff98578-ed6d-3f38-714c-49b0eee844e6
+UUID urn:uuid:41dcf8c7-d846-3311-7f6b-4a943c10237f
 Info TEST @ linux-a5xv
 Location linux-a5xv.local
-DeviceURI ipp://linux-a5xv.local:631/printers/TEST
+DeviceURI ipps://linux-a5xv.local:631/printers/TEST
 State Idle
-StateTime 1528967089
-ConfigTime 1528967089
+StateTime 1529306744
+ConfigTime 1529306744
 Type 6
 Accepting Yes
 Shared No