New printer config

diff --git a/files/etc/cups/clients.conf/FSF b/files/etc/cups/clients.conf/FSF
new file mode 100644 (file)
index 0000000..b0f35e1
--- /dev/null
+++ b/files/etc/cups/clients.conf/FSF
@@ -0,0 +1 @@
+ServerName printserver0.office.fsf.org

diff --git a/files/etc/cups/printers.conf/FSF b/files/etc/cups/printers.conf/FSF
deleted file mode 100644 (file)
index 62c0091..0000000
--- a/files/etc/cups/printers.conf/FSF
+++ /dev/null
@@ -1,78 +0,0 @@
-# Printer configuration file for CUPS v1.7.2
-# Written by cupsd
-# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-<Printer HP4050>
-UUID urn:uuid:fcac7739-2941-3010-63ca-9e9e0951447b
-AuthInfoRequired none
-Info HP4050
-Location Back office
-DeviceURI http://192.168.0.25:631/printers/HP4050
-PPDTimeStamp *
-State Idle
-StateTime 1418325403
-Reason toner-low-report
-Reason media-empty-warning
-Type 8433692
-Accepting Yes
-Shared No
-ColorManaged Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Attribute marker-colors none
-Attribute marker-levels 0
-Attribute marker-names Toner Cartridge HP C4127X
-Attribute marker-types toner
-Attribute marker-change-time 1418325396
-</Printer>
-<Printer imagistics>
-UUID urn:uuid:fcac7739-2941-3010-63ca-9e9e0951447b
-AuthInfoRequired none
-Info imagistics
-Location Back office
-DeviceURI http://192.168.0.25:631/printers/imagistics
-PPDTimeStamp *
-State Idle
-StateTime 1423152804
-Type 8388612
-Accepting Yes
-Shared No
-ColorManaged Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Attribute marker-colors none,none,none
-Attribute marker-levels -1,-1,-1
-Attribute marker-names Toner Cartridge,DC Unit,Developer Unit
-Attribute marker-types toner,opc,developer
-Attribute marker-change-time 1423152802
-</Printer>
-<DefaultPrinter Xerox-Phaser-4500DX>
-UUID urn:uuid:2fe87c77-87cf-323f-6105-d0140b8678d3
-Info Xerox-Phaser-4500DX
-DeviceURI dnssd://phaser%20(9a%3A34%3Ac8)._pdl-datastream._tcp.local/
-PPDTimeStamp *
-State Idle
-StateTime 1423699116
-Type 8425684
-Accepting Yes
-Shared Yes
-ColorManaged Yes
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Attribute marker-colors \#000000,none
-Attribute marker-levels 88,8
-Attribute marker-names Print Cartridge,Fuser
-Attribute marker-types toner,fuser
-Attribute marker-change-time 1423699116
-</Printer>

diff --git a/scripts/FSF/20_set_up_printers.sh b/scripts/FSF/20_set_up_printers.sh
index c87084aa0e699d92e1b5894457be625b806e81b7..53f3404eb73f227438188bb5b876d1bf0cf8d646 100755 (executable)
--- a/scripts/FSF/20_set_up_printers.sh
+++ b/scripts/FSF/20_set_up_printers.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
 
-fcopy -v /etc/cups/printers.conf
+fcopy -v /etc/cups/clients.conf
+if $ROOTCMD test -f /etc/cups/printers.conf ; then
+    $ROOTCMD rm -f /etc/cups/printers.conf
+fi