From 8d925cda105a93cc64b191612529af705e93764e Mon Sep 17 00:00:00 2001 From: mhoellein Date: Mon, 18 Jun 2018 19:45:29 +0200 Subject: [PATCH] =?utf8?q?=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .etckeeper | 2 -- .gitignore | 4 ++-- console-setup/cached.kmap.gz | Bin 4382 -> 4382 bytes cups/printers.conf | 39 ----------------------------------- cups/printers.conf.O | 8 +++---- 5 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 cups/printers.conf diff --git a/.etckeeper b/.etckeeper index a11d862..a854980 100755 --- 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 9acd39a..40ed4c6 100644 --- 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 GIT binary patch delta 16 XcmbQIG*5|LzMF%=J63%oySN|#CBXyf delta 16 XcmbQIG*5|LzMF&LY>m=Jc5y)fDewe^ diff --git a/cups/printers.conf b/cups/printers.conf deleted file mode 100644 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 - -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 - - -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 - diff --git a/cups/printers.conf.O b/cups/printers.conf.O index c6eb5ed..da48bb3 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -38,13 +38,13 @@ OpPolicy default ErrorPolicy retry-job -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 -- 2.43.0