Current state

diff --git a/bind/named.conf b/bind/named.conf
index b7cc8d3ff5f9e596666f07ab465a5c3999123788..6bc1bf96aafd385f0cfa17dbdf7575694f382caa 100644 (file)
--- a/bind/named.conf
+++ b/bind/named.conf
@@ -79,7 +79,8 @@ options {
 
        allow-transfer {
                /* Zone tranfers are denied by default. */
-               none;
+               trusted;
+               private_ips;
        };
 
        allow-update {
@@ -147,6 +148,52 @@ zone "127.in-addr.arpa" IN {
        notify no;
 };
 
+#zone "home.brehm-online.com" IN {
+#    type forward;
+#    forwarders {
+#              //85.214.147.150;
+#        //85.214.134.152;
+#              2a01:238:4225:6e00:8f8c:808a:7fb8:88df;
+#              2a01:238:4239:8a00:d4da:215d:3d01:f9b9;
+#    };
+#};
+
+zone "home.brehm-online.com" IN {
+    type slave;
+    file "sec/home.brehm-online.com.zone";
+    masters {
+               2a01:238:4225:6e00:8f8c:808a:7fb8:88df;
+               2a01:238:4239:8a00:d4da:215d:3d01:f9b9;
+        //85.214.134.152;
+    };
+    //allow-transfer {
+    //    transfer_hosts;
+    //};
+};
+
+#zone "11.12.10.in-addr.arpa" IN {
+#    type forward;
+#    forwarders {
+#              //85.214.147.150;
+#        //85.214.134.152;
+#              2a01:238:4225:6e00:8f8c:808a:7fb8:88df;
+#              2a01:238:4239:8a00:d4da:215d:3d01:f9b9;
+#    };
+#};
+
+zone "11.12.10.in-addr.arpa" IN {
+    type slave;
+    file "sec/rev.10.12.11.zone";
+    masters {
+               2a01:238:4225:6e00:8f8c:808a:7fb8:88df;
+               2a01:238:4239:8a00:d4da:215d:3d01:f9b9;
+        //85.214.134.152;
+    };
+    //allow-transfer {
+    //    transfer_hosts;
+    //};
+};
+
 /*
  * Briefly, a zone which has been declared delegation-only will be effectively
  * limited to containing NS RRs for subdomains, but no actual data beyond its

diff --git a/cups/classes.conf b/cups/classes.conf
index 8d74fcc8eb5dd14cf93fe20a05b3086b2020f786..c712beb1f0fc6f4b4424171d45bfc4a4520d3227 100644 (file)
--- a/cups/classes.conf
+++ b/cups/classes.conf
@@ -1,3 +1,3 @@
-# Class configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-01-17 23:52
+# Class configuration file for CUPS v1.5.2
+# Written by cupsd on 2013-02-16 13:36
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING

diff --git a/cups/ppd/Kyocera_FS-1020D.ppd b/cups/ppd/Kyocera_FS-1020D.ppd
new file mode 100644 (file)
index 0000000..f9310b1
--- /dev/null
+++ b/cups/ppd/Kyocera_FS-1020D.ppd
@@ -0,0 +1,746 @@
+*PPD-Adobe: "4.3"
+*%=============================================================================
+*%
+*%  PPD for Kyocera Mita FS-1020D (German)
+*%  Linux Version
+*%
+*%  Copyright (C) 2000 KYOCERA CORPORATION
+*%  Copyright (C) 2005 Revised Edition KYOCERA MITA CORPORATION
+*%
+*%  Permission is hereby granted, free of charge, to any person obtaining
+*%  a copy of this software and associated documentation files (the
+*%  "Software"), to deal in the Software without restriction, including
+*%  without limitation the rights to use, copy, modify, merge, publish,
+*%  distribute, sublicense, and/or sell copies of the Software, and to
+*%  permit persons to whom the Software is furnished to do so, subject to
+*%  the following conditions:
+*%
+*%  The above copyright notice and this permission notice shall be
+*%  included in all copies or substantial portions of the Software.
+*%
+*%  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+*%  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+*%  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+*%  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+*%  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+*%  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+*%  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*%
+*%  [this is the MIT open source license -- see www.opensource.org]
+*%
+*%=============================================================================
+
+*FileVersion: "8.2"
+*FormatVersion: "4.3"
+*LanguageEncoding: ISOLatin1 
+*PCFileName: "KM1020DE.PPD"
+*LanguageVersion: German
+*Product: "(FS-1020D)"
+*PSVersion: "(3010.106) 1"
+*Manufacturer: "Kyocera Mita"
+*ModelName: "Kyocera Mita FS-1020D"
+*ShortNickName: "Kyocera Mita FS-1020D"
+*NickName: "Kyocera Mita FS-1020D"
+
+*% Basic Device Capabilities
+*LanguageLevel: "3"
+*ColorDevice: False
+*DefaultColorSpace: Gray
+*TTRasterizer: Type42
+*?TTRasterizer: "
+  save
+  42 /FontType resourcestatus
+  { pop pop (Type42) }{ (None) } ifelse
+  = flush restore"
+*End
+*FreeVM: "9122000"
+*Throughput: "20"
+
+*% System Management
+*SuggestedJobTimeout: "0"
+*SuggestedManualFeedTimeout: "0"
+*SuggestedWaitTimeout: "120"
+*PrintPSErrors: True
+
+*Password: "0"
+
+*ExitServer: "
+  count 0 eq {true}
+  {dup statusdict /checkpassword get exec not} ifelse
+  {(WARNING : Cannot perform the exitserver command.) =
+    (Password supplied is not valid.) =
+    (Please contact the author of this software.) = flush quit} if
+  serverdict /exitserver get exec"
+*End
+
+*Reset: "
+  count 0 eq { true }
+  {dup statusdict /checkpassword get exec not} ifelse
+  {(WARNING : Cannot perform the exitserver command.) =
+    (Password supplied is not valid.) =
+    (Please contact the author of this software.) = flush quit} if
+  serverdict /exitserver get exec
+  systemdict /quit get exec
+  (WARNING : Printer Reset Failed.) = flush"
+*End
+
+*% Protocols
+*Protocols: PJL TBCP
+
+*1284Modes Parallel: Compat Nibble ECP
+*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+
+*% JCL Information 
+*JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+*JCLToPSInterpreter: "@PJL ENTER LANGUAGE=POSTSCRIPT<0A>"
+*JCLEnd: "<1B>%-12345X@PJL EOJ<0A><1B>%-12345X"
+
+*JCLOpenUI *JCLEconomode/EcoPrint: PickOne
+*DefaultJCLEconomode: Off
+*OrderDependency: 5 JCLSetup *JCLEconomode
+*JCLEconomode Off/Aus: "@PJL SET ECONOMODE=OFF<0A>"
+*JCLEconomode On/Ein: "@PJL SET ECONOMODE=ON<0A>"
+*JCLCloseUI: *JCLEconomode
+
+*% Installable Options
+*OpenGroup: InstallableOptions/Installierte Optionen
+
+*% Paper Feeder
+*OpenUI *Option8/Papierzuf<FC>hrung: Boolean
+*DefaultOption8: None
+*Option8 None/Nicht installiert: ""
+*Option8 True/Installiert: ""
+*?Option8: "
+  save
+  (False) currentpagedevice dup /InputAttributes known {
+    /InputAttributes get
+    dup 1 known {dup 1 get null ne {exch pop (True) exch} if} if
+  } if pop
+  = flush restore"
+*End
+*CloseUI: *Option8
+
+*% Disk Drive
+*OpenUI *Option18/Optionaler Datentr<E4>ger: PickOne
+*DefaultOption18: None
+*Option18 None/Keine: ""
+*Option18 RAMDisk/RAM Disk: ""
+*?Option18: "
+  save
+  false
+  (%disk?%)
+  {currentdevparams dup /Writeable known
+    {dup /Writeable get
+      {exch pop /LogicalSize get dup 0 gt exch 102400 lt eq true}{pop pop false} ifelse
+    }{pop pop} ifelse
+  } 100 string /IODevice resourceforall
+  {{(RAMDisk)}{(HardDisk)} ifelse}{(None)} ifelse
+  = flush restore"
+*End
+*CloseUI: *Option18
+
+*% Installed Memory
+*OpenUI *InstalledMemory/Speicher: PickOne
+*DefaultInstalledMemory: 16MB
+*InstalledMemory 16MB/Standard: ""
+*InstalledMemory 24MB/8MB Erweiterung: ""
+*InstalledMemory 32MB/16MB Erweiterung: ""
+*InstalledMemory 48MB/32MB Erweiterung: ""
+*InstalledMemory 80MB/64MB Erweiterung: ""
+*InstalledMemory 144MB/128MB Erweiterung: ""
+*InstalledMemory 272MB/256MB Erweiterung: ""
+*?InstalledMemory: "
+  save
+  currentsystemparams dup
+  /RamSize known {
+    /RamSize get
+    524288 div ceiling cvi 2 div cvi
+    /vmsize 20 string def
+    vmsize cvs print
+    (MB) print (\n) print flush
+  }{
+    pop (Unknown) print flush
+  } ifelse
+  restore"
+*End
+*CloseUI: *InstalledMemory
+
+*CloseGroup: InstallableOptions
+
+*% Virtual Memory 
+*VMOption 16MB: "9122000"
+*VMOption 24MB: "19008000"
+*VMOption 32MB: "22544000"
+*VMOption 48MB: "35966000"
+*VMOption 80MB: "59328000"
+*VMOption 144MB: "59328000"
+*VMOption 272MB: "59328000"
+
+
+*% Constraints
+*UIConstraints: *Option8 None *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *Option8 None
+*UIConstraints: *MediaType Transparency *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Transparency
+*UIConstraints: *MediaType Labels *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Labels
+*UIConstraints: *MediaType Envelope *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Envelope
+*UIConstraints: *MediaType Vellum *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Vellum
+*UIConstraints: *MediaType Cardstock *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Cardstock
+*UIConstraints: *MediaType Transparency *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Transparency
+*UIConstraints: *MediaType Labels *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Labels
+*UIConstraints: *MediaType Envelope *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Envelope
+*UIConstraints: *MediaType Vellum *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Vellum
+*UIConstraints: *MediaType Cardstock *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Cardstock
+*UIConstraints: *KCCollate *Option18 None
+*UIConstraints: *Option18 None *KCCollate Temp
+*UIConstraints: *PageSize A6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize A6
+*UIConstraints: *PageRegion A6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion A6
+*UIConstraints: *PageSize B6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize B6
+*UIConstraints: *PageRegion B6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion B6
+*UIConstraints: *PageSize EnvPersonal *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvPersonal
+*UIConstraints: *PageSize Env9 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Env9
+*UIConstraints: *PageRegion Env9 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Env9
+*UIConstraints: *PageSize Env10 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Env10
+*UIConstraints: *PageRegion Env10 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Env10
+*UIConstraints: *PageSize EnvMonarch *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvMonarch
+*UIConstraints: *PageSize EnvDL *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvDL
+*UIConstraints: *PageRegion EnvDL *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvDL
+*UIConstraints: *PageSize EnvC5 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvC5
+*UIConstraints: *PageRegion EnvC5 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvC5
+*UIConstraints: *PageSize Statement *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Statement
+*UIConstraints: *PageRegion Statement *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Statement
+*UIConstraints: *PageSize Executive *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Executive
+*UIConstraints: *PageRegion Executive *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Executive
+*UIConstraints: *PageSize A6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize A6
+*UIConstraints: *PageRegion A6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion A6
+*UIConstraints: *PageSize B6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize B6
+*UIConstraints: *PageRegion B6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion B6
+*UIConstraints: *PageSize EnvPersonal *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvPersonal
+*UIConstraints: *PageSize Env9 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Env9
+*UIConstraints: *PageRegion Env9 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Env9
+*UIConstraints: *PageSize Env10 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Env10
+*UIConstraints: *PageRegion Env10 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Env10
+*UIConstraints: *PageSize EnvMonarch *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvMonarch
+*UIConstraints: *PageSize EnvDL *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvDL
+*UIConstraints: *PageRegion EnvDL *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvDL
+*UIConstraints: *PageSize EnvC5 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvC5
+*UIConstraints: *PageRegion EnvC5 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvC5
+*UIConstraints: *PageSize Statement *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Statement
+*UIConstraints: *PageRegion Statement *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Statement
+*UIConstraints: *PageSize P16K *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize P16K
+*UIConstraints: *PageRegion P16K *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion P16K
+*UIConstraints: *Duplex *PageSize Executive
+*UIConstraints: *PageSize Executive *Duplex DuplexTumble
+*UIConstraints: *PageSize Executive *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Executive
+*UIConstraints: *PageRegion Executive *Duplex DuplexTumble
+*UIConstraints: *PageRegion Executive *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize A6
+*UIConstraints: *PageSize A6 *Duplex DuplexTumble
+*UIConstraints: *PageSize A6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion A6
+*UIConstraints: *PageRegion A6 *Duplex DuplexTumble
+*UIConstraints: *PageRegion A6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize ISOB5
+*UIConstraints: *PageSize ISOB5 *Duplex DuplexTumble
+*UIConstraints: *PageSize ISOB5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion ISOB5
+*UIConstraints: *PageRegion ISOB5 *Duplex DuplexTumble
+*UIConstraints: *PageRegion ISOB5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize B6
+*UIConstraints: *PageSize B6 *Duplex DuplexTumble
+*UIConstraints: *PageSize B6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion B6
+*UIConstraints: *PageRegion B6 *Duplex DuplexTumble
+*UIConstraints: *PageRegion B6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvPersonal
+*UIConstraints: *PageSize EnvPersonal *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvPersonal *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Env9
+*UIConstraints: *PageSize Env9 *Duplex DuplexTumble
+*UIConstraints: *PageSize Env9 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Env9
+*UIConstraints: *PageRegion Env9 *Duplex DuplexTumble
+*UIConstraints: *PageRegion Env9 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Env10
+*UIConstraints: *PageSize Env10 *Duplex DuplexTumble
+*UIConstraints: *PageSize Env10 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Env10
+*UIConstraints: *PageRegion Env10 *Duplex DuplexTumble
+*UIConstraints: *PageRegion Env10 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvMonarch
+*UIConstraints: *PageSize EnvMonarch *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvMonarch *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvDL
+*UIConstraints: *PageSize EnvDL *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvDL *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvDL
+*UIConstraints: *PageRegion EnvDL *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvDL *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvC5
+*UIConstraints: *PageSize EnvC5 *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvC5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvC5
+*UIConstraints: *PageRegion EnvC5 *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvC5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize OficioII
+*UIConstraints: *PageSize OficioII *Duplex DuplexTumble
+*UIConstraints: *PageSize OficioII *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion OficioII
+*UIConstraints: *PageRegion OficioII *Duplex DuplexTumble
+*UIConstraints: *PageRegion OficioII *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Folio
+*UIConstraints: *PageSize Folio *Duplex DuplexTumble
+*UIConstraints: *PageSize Folio *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Folio
+*UIConstraints: *PageRegion Folio *Duplex DuplexTumble
+*UIConstraints: *PageRegion Folio *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Statement
+*UIConstraints: *PageSize Statement *Duplex DuplexTumble
+*UIConstraints: *PageSize Statement *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Statement
+*UIConstraints: *PageRegion Statement *Duplex DuplexTumble
+*UIConstraints: *PageRegion Statement *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize P16K
+*UIConstraints: *PageSize P16K *Duplex DuplexTumble
+*UIConstraints: *PageSize P16K *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion P16K
+*UIConstraints: *PageRegion P16K *Duplex DuplexTumble
+*UIConstraints: *PageRegion P16K *Duplex DuplexNoTumble
+
+*% Resolution 
+*OpenUI *Resolution/Aufl<F6>sung: PickOne
+*OrderDependency: 10 AnySetup *Resolution
+*DefaultResolution: 800dpi
+*Resolution 300dpi/300 dpi: "<< /HWResolution [300 300] >> setpagedevice"
+*Resolution 600dpi/600 dpi: "<< /HWResolution [600 600] >> setpagedevice"
+*Resolution 800dpi/Fast 1200 dpi: "<< /HWResolution [600 600] /PreRenderingEnhance true >> setpagedevice"
+*?Resolution: "save currentpagedevice /HWResolution get 0 get (      ) cvs print (dpi) = flush restore"
+*CloseUI: *Resolution
+
+*% Image Refinement 
+*OpenUI *Smoothing/KIR: PickOne
+*OrderDependency: 50 AnySetup *Smoothing
+*DefaultSmoothing: Medium
+*Smoothing None/Aus: "0 statusdict /setdoret get exec"
+*Smoothing Medium/Ein: "2 statusdict /setdoret get exec"
+*?Smoothing: "
+  save
+  [(None)(Medium)(Medium)(Medium)]
+  statusdict /doret get exec {get} stopped
+  {pop pop (Unknown)} if
+  = flush restore"
+*End
+*CloseUI: *Smoothing
+
+*% Halftone Information 
+*DefaultHalftoneType: 1
+*ScreenFreq: "37.5"
+*ScreenAngle: "45.0"
+*ResScreenFreq 600dpi: "37.5"
+*ResScreenAngle 600dpi: "45.0"
+*ResScreenFreq 300dpi: "18.75"
+*ResScreenAngle 300dpi: "45.0"
+
+*DefaultScreenProc: Ellipse
+*ScreenProc Dot: "
+  {abs exch abs 2 copy add 1 gt
+  {1 sub dup mul exch 1 sub dup mul add 1 sub}
+  {dup mul exch dup mul add 1 exch sub} ifelse}"
+*End
+*ScreenProc Line: "{pop}"
+*ScreenProc Ellipse: "{dup 5 mul 8 div mul exch dup mul exch add sqrt 1 exch sub}"
+*DefaultTransfer: Null
+*Transfer Null: "{}"
+*Transfer Null.Inverse: "{1 exch sub}"
+
+*% Paper Handling 
+*% Page Size Definitions
+*OpenUI *PageSize: PickOne
+*OrderDependency: 40 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"
+*PageSize A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"
+*PageSize A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"
+*PageSize B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"
+*PageSize ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"
+*PageSize B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"
+*PageSize OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"
+*PageSize Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"
+*PageSize Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"
+*PageSize P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"
+*PageSize Letter/US-Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"
+*PageSize Legal/US-Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"
+*PageSize Executive/US-Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"
+*PageSize EnvPersonal/Umschlag #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"
+*PageSize Env9/Umschlag #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"
+*PageSize Env10/Umschlag #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"
+*PageSize EnvMonarch/Umschlag US-Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"
+*PageSize EnvDL/Umschlag DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"
+*PageSize EnvC5/Umschlag C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"
+*?PageSize: "
+  save
+  currentpagedevice /PageSize get aload pop
+  2 copy gt {exch} if
+  (Unknown)
+  19 dict
+  dup [595 842] (A4) put
+  dup [420 595] (A5) put
+  dup [297 420] (A6) put
+  dup [516 729] (B5) put
+  dup [499 709] (ISOB5) put
+  dup [363 516] (B6) put
+  dup [612 936] (OficioII) put
+  dup [595 935] (Folio) put
+  dup [396 612] (Statement) put
+  dup [558 774] (P16K) put
+  dup [612 792] (Letter) put
+  dup [612 1008] (Legal) put
+  dup [522 756] (Executive) put
+  dup [261 468] (EnvPersonal) put
+  dup [279 639] (Env9) put
+  dup [297 684] (Env10) put
+  dup [279 540] (EnvMonarch) put
+  dup [312 624] (EnvDL) put
+  dup [459 649] (EnvC5) put
+  {exch aload pop 4 index sub abs 5 le exch
+    5 index sub abs 5 le and
+    {exch pop exit}{pop} ifelse
+  } bind forall
+  = flush pop pop restore "
+*End
+*CloseUI: *PageSize
+
+*% Page Region Definitions for Frame Buffer
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 40 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"
+*PageRegion A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"
+*PageRegion A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"
+*PageRegion B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"
+*PageRegion ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"
+*PageRegion B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"
+*PageRegion Letter/US-Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"
+*PageRegion Legal/US-Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"
+*PageRegion Executive/US-Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvPersonal/Umschlag #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"
+*PageRegion Env9/Umschlag #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"
+*PageRegion Env10/Umschlag #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvMonarch/Umschlag US-Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvDL/Umschlag DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvC5/Umschlag C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"
+*PageRegion OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"
+*PageRegion Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"
+*PageRegion Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"
+*PageRegion P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"
+*CloseUI: *PageRegion
+
+*% Imageable Area Definitions
+*DefaultImageableArea: A4
+*ImageableArea A4/A4: "12 10 583 832"
+*ImageableArea A5/A5: "12 12 409 585"
+*ImageableArea A6/A6: "12 10 285 411"
+*ImageableArea B5/B5 (JIS): "21 10 495 719"
+*ImageableArea ISOB5/B5 (ISO): "12 12 487 696"
+*ImageableArea B6/B6: "12 10 352 506"
+*ImageableArea OficioII/Oficio II: "12 12 600 924"
+*ImageableArea Folio/8.5X13 (Folio): "12 12 571 911"
+*ImageableArea Statement/Statement: "12 12 384 600"
+*ImageableArea P16K/16K: "12 12 546 762"
+*ImageableArea Letter/US-Letter: "12 08 600 784"
+*ImageableArea Legal/US-Legal: "12 08 600 1000"
+*ImageableArea Executive/US-Executive: "12 08 510 748"
+*ImageableArea EnvPersonal/Umschlag #6: "12 08 237 452"
+*ImageableArea Env9/Umschlag #9: "12 08 255 623"
+*ImageableArea Env10/Umschlag #10: "12 08 273 668"
+*ImageableArea EnvMonarch/Umschlag US-Monarch: "12 08 255 524"
+*ImageableArea EnvDL/Umschlag DL: "12 10 288 604"
+*ImageableArea EnvC5/Umschlag C5: "12 10 435 629"
+*?ImageableArea: "
+  save
+  /cvp {cvi (                   ) cvs
+  print ( ) print} bind def
+  newpath clippath pathbbox
+  4 -2 roll exch 2 {ceiling cvp} repeat
+  exch 2 {floor cvp} repeat ( )
+  = flush restore"
+*End
+
+*% Physical Dimensions of Media
+*DefaultPaperDimension: A4
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension B5/B5 (JIS): "516 729"
+*PaperDimension ISOB5/B5 (ISO): "499 709"
+*PaperDimension B6/B6: "363 516"
+*PaperDimension OficioII/Oficio II: "612 936"
+*PaperDimension Folio/8.5X13 (Folio): "595 935"
+*PaperDimension Statement/Statement: "396 612"
+*PaperDimension P16K/16K: "558 774"
+*PaperDimension Letter/US-Letter: "612 792"
+*PaperDimension Legal/US-Legal: "612 1008"
+*PaperDimension Executive/US-Executive: "522 756"
+*PaperDimension EnvPersonal/Umschlag #6: "261 468"
+*PaperDimension Env9/Umschlag #9: "279 639"
+*PaperDimension Env10/Umschlag #10: "297 684"
+*PaperDimension EnvMonarch/Umschlag US-Monarch: "279 540"
+*PaperDimension EnvDL/Umschlag DL: "312 624"
+*PaperDimension EnvC5/Umschlag C5: "459 649"
+
+*% Input Slot Definitions
+*OpenUI *InputSlot: PickOne
+*OrderDependency: 30 AnySetup *InputSlot
+*DefaultInputSlot: Internal
+*InputSlot Internal/Kassette 1 (Intern): "<</ManualFeed false>> setpagedevice statusdict begin 0 setpapertray end"
+*InputSlot PF17/Kassette 2: "<</ManualFeed false>> setpagedevice statusdict begin 1 setpapertray end"
+*InputSlot MF1/Mehrzweckzufuhr: "currentpagedevice /InputAttributes get 3 get null eq
+{ <</ManualFeed true>> setpagedevice }{ statusdict begin 3 setpapertray end } ifelse"
+*End
+*InputSlot MF/Papierzufuhr Handeinzug: "<< /ManualFeed true >> setpagedevice"
+*?InputSlot: ""
+*CloseUI: *InputSlot
+
+*% MediaType Definitions
+*OpenUI *MediaType: PickOne
+*OrderDependency: 100 AnySetup *MediaType
+*DefaultMediaType: PrnDef
+*MediaType PrnDef/Standard: ""
+*MediaType Plain/Normalpapier: "<</ManualFeed false /MediaType (Plain) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Transparency/ Folien: "<</ManualFeed false /MediaType (Transparency) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Labels/Etiketten: "<</ManualFeed false /MediaType (Labels) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Letterhead/Briefpapier: "<</ManualFeed false /MediaType (Letterhead) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Bond/Feinpapier: "<</ManualFeed false /MediaType (Bond) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Color/Farbe: "<</ManualFeed false /MediaType (Color) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Preprinted/Vordrucke: "<</ManualFeed false /MediaType (Preprinted) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Prepunched/Gelochtes Papier: "<</ManualFeed false /MediaType (Prepunched) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Recycled/Recycling Papier: "<</ManualFeed false /MediaType (Recycled) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Rough/Grobes Papier: "<</ManualFeed false /MediaType (Rough) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Cardstock/Karteikarte: "<</ManualFeed false /MediaType (Card Stock) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Vellum/Pergamentpapier: "<</ManualFeed false /MediaType (Vellum) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Envelope/Umschlag: "<</ManualFeed false /MediaType (Envelope) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User1/Anwender 1: "<</ManualFeed false /MediaType (Custom Type1) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User2/Anwender 2: "<</ManualFeed false /MediaType (Custom Type2) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User3/Anwender 3: "<</ManualFeed false /MediaType (Custom Type3) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User4/Anwender 4: "<</ManualFeed false /MediaType (Custom Type4) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User5/Anwender 5: "<</ManualFeed false /MediaType (Custom Type5) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User6/Anwender 6: "<</ManualFeed false /MediaType (Custom Type6) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User7/Anwender 7: "<</ManualFeed false /MediaType (Custom Type7) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User8/Anwender 8: "<</ManualFeed false /MediaType (Custom Type8) /DeferredMediaSelection true >> setpagedevice"
+*?MediaType: "
+  save
+    currentpagedevice /MediaType {get} stopped
+    {pop pop (Unknown)} {dup null eq {pop (Unknown)} if} ifelse = flush
+  restore"
+*End
+*CloseUI: *MediaType
+
+*RequiresPageRegion All: True
+*% Duplex Definitions
+*OpenUI *Duplex/Duplex: PickOne
+*OrderDependency: 50 AnySetup *Duplex
+*DefaultDuplex: DuplexNoTumble
+*Duplex None/Keine: "statusdict begin false setduplexmode false settumble end"
+*Duplex DuplexTumble/Binden Kurze Seite: "statusdict begin true setduplexmode true settumble end"
+*Duplex DuplexNoTumble/Binden Lange Seite: "statusdict begin true setduplexmode false settumble end"
+*?Duplex: "
+  save
+  statusdict begin
+  duplexmode
+  {tumble {(DuplexTumble)}{(DuplexNoTumble)} ifelse}
+  {(None)} ifelse
+  = flush end restore"
+*End
+*CloseUI: *Duplex
+
+*% Job Spooling Definitions
+*OpenUI *KCCollate/Job Zwischenspeicherung: PickOne
+*OrderDependency: 20 AnySetup *KCCollate
+*DefaultKCCollate: None
+*KCCollate None/Keine: ""
+*KCCollate Temp/Tempor<E4>r: "
+  userdict /UICollateDetails known not {userdict /UICollateDetails 10 dict put} if
+  userdict /UICollateDetails get /Mode 0 put <</Collate true /CollateDetails UICollateDetails>> setpagedevice"
+*End
+*?KCCollate: "
+  save
+  currentpagedevice dup /Collate known {
+    dup /CollateDetails known {
+      /CollateDetails get
+      dup /Mode known {
+        /Mode get
+        1 {
+          dup 0 eq {pop (Temp) exit} if
+          pop (Unknown)
+        } repeat
+      }{pop (Unknown)} ifelse
+    }{pop (Unknown)} ifelse
+  }{pop (Unknown)} ifelse
+  = flush restore"
+*End
+*CloseUI: *KCCollate
+
+*% PPD Version Info 
+*OpenUI *KMVersion/PPD Version: PickOne
+*OrderDependency: 25 AnySetup *KMVersion
+*DefaultKMVersion: Default
+*KMVersion Default/8.2.0111 [01-11-2005]: "
+globaldict /ct_AddStdCIDMap known {
+globaldict /ct_AddStdCIDMap get  length 7 eq
+{globaldict /ct_AddStdCIDMap get  0 get type /stringtype eq
+{globaldict /ct_AddStdCIDMap get  1 get 0 eq
+{globaldict /ct_AddStdCIDMap get  2 get () eq
+{globaldict /ct_AddStdCIDMap get  3 get /SubFileDecode eq
+{globaldict /ct_AddStdCIDMap get  4 get systemdict /filter get eq
+{currentglobal true setglobal globaldict
+/ct_AddStdCIDMap
+globaldict /ct_AddStdCIDMap get dup
+globaldict /ct_AddStdCIDMap get
+0 get length 1 exch
+put put setglobal
+} if} if} if} if} if} if} if"
+*End
+*CloseUI: *KMVersion
+
+*% Font Information
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
+*Font Bookman-Light: Standard "(001.004S)" Standard ROM
+*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
+*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
+*Font Courier: Standard "(002.004S)" Standard ROM
+*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
+*Font Courier-Bold: Standard "(002.004S)" Standard ROM
+*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
+*Font Helvetica: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
+*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
+*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
+*Font Symbol: Special "(001.007S)" Special ROM
+*Font Times-Roman: Standard "(001.007S)" Standard ROM
+*Font Times-Italic: Standard "(001.007S)" Standard ROM
+*Font Times-Bold: Standard "(001.007S)" Standard ROM
+*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
+*Font ZapfDingbats: Special "(001.004S)" Special ROM
+*?FontQuery: "
+  save
+  /str 100 string dup 0 (fonts/) putinterval def
+  {count 1 gt
+    { exch dup str 6 94 getinterval cvs
+      (/) print print (:) print
+      FontDirectory exch known
+      {(Yes)}{(No)} ifelse =
+    }{exit} ifelse
+  } bind loop (*)
+  = flush restore"
+*End
+*?FontList: "save FontDirectory { pop == } bind forall flush (*) = flush restore"
+*% Printer Messages
+*Message: "%%[ exitserver: permanent state may be changed ]%%"
+*Message: "%%[ Flushing: rest of job (to end-of-file) will be ignored ]%%"
+*Message: "\FontName\ not found, using Courier"
+
+*% Status (format: %%[ status: <one of these> ]%% )
+*Status: "warming up"/warming up
+*Status: "idle"/idle
+*Status: "busy"/busy
+*Status: "waiting"/waiting
+*Status: "printing"/printing
+*Status: "initializing"/initializing
+*Status: "printing test page"/printing test page
+*% Printer Error (format: %%[ PrinterError: <one of these> ]%% )
+*PrinterError: "paper entry misfeed"
+*PrinterError: "cover open"
+*PrinterError: "no paper tray"
+*PrinterError: "out of paper"
+*PrinterError: "toner low (halt)"
+*PrinterError: "warming up"
+*PrinterError: "other reason"
+*PrinterError: "video interface mode"
+*PrinterError: "offline"
+*PrinterError: "toner low (warning)"
+
+*% Input Sources (format: %%[ status: <stat>;source:<one of these> ]%% )
+*Source: "Serial"
+*Source: "Parallel"
+*Source: "LocalTalk"
+*Source: "Option"
+
+*%  End of PPD file for Kyocera Mita FS-1020D (German)

diff --git a/cups/printers.conf b/cups/printers.conf
index 161ca530685cb5e124703f2befbc0f2f3ec31079..bebc587771ec9559808441855793c582dcff9797 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,6 +1,24 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-01-29 21:28
+# Written by cupsd on 2013-02-16 13:37
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
+<DefaultPrinter Kyocera_FS-1020D>
+UUID urn:uuid:4fe502f0-362b-3fa2-519f-648848519e5e
+Info 
+Location 
+MakeModel Kyocera Mita FS-1020D
+DeviceURI lpd://10.12.11.32/lp
+State Idle
+StateTime 1361018142
+Type 8392788
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy stop-printer
+</Printer>
 <Printer Virtual_Printer>
 UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4
 Info PDF Printer

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 9dd88f04e9cf83c94da6f75e5b992be8a154e54f..fd809d63449e143fd946d3a69ca6c9cf18593bb8 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,19 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-01-04 20:58
-NextSubscriptionId 136
+# Written by cupsd on 2013-02-16 13:36
+NextSubscriptionId 139
+<Subscription 137>
+Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted
+Owner root
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1361104072
+NextEventId 13
+</Subscription>
+<Subscription 138>
+Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
+Owner frank
+LeaseDuration 86400
+Interval 0
+ExpirationTime 1361104493
+NextEventId 4
+</Subscription>

diff --git a/openvpn/profitbricks/resolv.conf b/openvpn/profitbricks/resolv.conf
index 2fa150037afe9ea9d884ec8f19bd16e31d63c45d..798c010b6dc8b70ce07d53a1c9239551f36605f3 100644 (file)
--- a/openvpn/profitbricks/resolv.conf
+++ b/openvpn/profitbricks/resolv.conf
@@ -1,6 +1,6 @@
 # Hand made by Frank Brehm
-domain brehm-online.com
-search brehm-online.com hennig-berlin.org uhu-banane.de profitbricks.localdomain dc1.de.profitbricks.net dc2.us.profitbricks.net pb.local
+domain home.brehm-online.com
+search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
 #nameserver 10.12.11.1
 nameserver 192.168.178.30
 nameserver 192.168.178.89

diff --git a/printcap b/printcap
index 52ce6e6eb741746bf6e5af2d3e503ca101e4d7f1..c648050657ba6d4b56ccf141d3553e64064d9895 100644 (file)
--- a/printcap
+++ b/printcap
@@ -1,4 +1,5 @@
 # This file was automatically generated by cupsd(8) from the
 # /etc/cups/printers.conf file.  All changes to this file
 # will be lost.
+Kyocera_FS-1020D|:rm=bruni.home.brehm-online.com:rp=Kyocera_FS-1020D:
 Virtual_Printer|PDF Printer:rm=bruni.home.brehm-online.com:rp=Virtual_Printer:

diff --git a/resolv.conf b/resolv.conf
index 6cb14a146ea5490d2eec59799f16b7edd29eb25b..543f79e73b0a8435872af77e187182aecc277d13 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,6 +1,4 @@
 # Generated by net-scripts for interface eth0
-domain brehm-online.com
-search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
-#nameserver 10.12.11.1
-nameserver 127.0.0.1
-nameserver 8.8.8.8
+domain home.brehm-online.com
+search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de
+nameserver 10.12.11.2