From bbf679a1b55fad99fac8ade984307399c820f77b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 18 Sep 2022 16:42:24 +0200 Subject: [PATCH] daily autocommit --- .etckeeper | 3 +- cmk-update-agent.state | 2 +- cups/ppd/EPSON_XP_8600_Series.ppd | 218 ------------------------------ cups/printers.conf | 23 +--- cups/printers.conf.O | 23 +++- forticlient/config.db | Bin 110592 -> 110592 bytes 6 files changed, 25 insertions(+), 244 deletions(-) delete mode 100644 cups/ppd/EPSON_XP_8600_Series.ppd diff --git a/.etckeeper b/.etckeeper index 7112b4d7..4403a27a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -15,6 +15,7 @@ mkdir -p './avahi/services' mkdir -p './binfmt.d' mkdir -p './ca-certificates/update.d' mkdir -p './cups/interfaces' +mkdir -p './cups/ppd' mkdir -p './cups/ssl' mkdir -p './dbus-1/session.d' mkdir -p './dconf/db' @@ -692,8 +693,6 @@ maybe chmod 0644 'cups/cupsd.conf' maybe chmod 0755 'cups/interfaces' maybe chgrp 'lp' 'cups/ppd' maybe chmod 0755 'cups/ppd' -maybe chgrp 'lp' 'cups/ppd/EPSON_XP_8600_Series.ppd' -maybe chmod 0640 'cups/ppd/EPSON_XP_8600_Series.ppd' maybe chgrp 'lp' 'cups/printers.conf' maybe chmod 0600 'cups/printers.conf' maybe chgrp 'lp' 'cups/printers.conf.O' diff --git a/cmk-update-agent.state b/cmk-update-agent.state index 28b8208e..532a9105 100644 --- a/cmk-update-agent.state +++ b/cmk-update-agent.state @@ -1 +1 @@ -{'last_error': "HTTPConnectionPool(host='192.168.0.99', port=80): Max retries exceeded with url: /realm/check_mk (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 101] Network is unreachable'))", 'host_secret': 'xwzcvzyndcggrfyywolofmarwejiprrcbatykpinzbhkmjzjvisyjyhxbismzxcc', 'server': '192.168.0.99', 'site': 'realm', 'host_name': 'localhost', 'protocol': 'http', 'user': 'caelebfi', 'last_check': 1661519511.2111123, 'installed_aghash': 'b1790695e4b67527', 'last_update': 1658998805.0110435, 'pending_hash': None} +{'last_error': "HTTPConnectionPool(host='192.168.0.99', port=80): Max retries exceeded with url: /realm/check_mk (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 101] Network is unreachable'))", 'host_secret': 'xwzcvzyndcggrfyywolofmarwejiprrcbatykpinzbhkmjzjvisyjyhxbismzxcc', 'server': '192.168.0.99', 'site': 'realm', 'host_name': 'localhost', 'protocol': 'http', 'user': 'caelebfi', 'last_check': 1661519511.2111123, 'installed_aghash': 'b1790695e4b67527', 'last_update': 1658998805.0110435, 'pending_hash': None} diff --git a/cups/ppd/EPSON_XP_8600_Series.ppd b/cups/ppd/EPSON_XP_8600_Series.ppd deleted file mode 100644 index d5b00d78..00000000 --- a/cups/ppd/EPSON_XP_8600_Series.ppd +++ /dev/null @@ -1,218 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "1.28.7" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "drvless.ppd" -*Manufacturer: "EPSON" -*ModelName: "EPSON XP-8600 Series" -*Product: "(EPSON XP-8600 Series)" -*NickName: "EPSON XP-8600 Series, driverless, cups-filters 1.28.7" -*ShortNickName: "EPSON XP-8600 Series" -*DefaultOutputOrder: Normal -*ColorDevice: True -*cupsVersion: 2.3 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*APSupplies: "http://EPSON70D247.local.:80/PRESENTATION/BONJOUR" -*cupsStringsURI: "http://EPSON70D247.local.:80/LANGUAGES/IPP?LANG=de" -*cupsFilter2: "image/urf image/urf 0 -" -*cupsFilter2: "image/jpeg image/jpeg 0 -" -*cupsManualCopies: True -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" -*PageSize 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" -*PageSize 120x120mm/CD/DVD: "<>setpagedevice" -*PageSize 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" -*PageSize 195x270mm/16K 195 x 270 mm: "<>setpagedevice" -*PageSize 3.5x5/3.5 x 5″: "<>setpagedevice" -*PageSize 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" -*PageSize 4x6/4 x 6″: "<>setpagedevice" -*PageSize 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" -*PageSize 5x7/5 x 7″: "<>setpagedevice" -*PageSize 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" -*PageSize 5x8/5 x 8″: "<>setpagedevice" -*PageSize 8x10/8 x 10″: "<>setpagedevice" -*PageSize 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A4.Borderless/A4 (Borderless): "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize A6/A6: "<>setpagedevice" -*PageSize B5/JIS B5: "<>setpagedevice" -*PageSize B6/JIS B6: "<>setpagedevice" -*PageSize Env10/Envelope #10: "<>setpagedevice" -*PageSize EnvC6/CEnvelope 6: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize FanFoldGermanLegal/Foolscap: "<>setpagedevice" -*PageSize Legal/US Legal: "<>setpagedevice" -*PageSize Letter/US Letter: "<>setpagedevice" -*PageSize Letter.Borderless/US Letter (Borderless): "<>setpagedevice" -*PageSize Postcard/Hagaki: "<>setpagedevice" -*PageSize Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" -*PageRegion 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" -*PageRegion 120x120mm/CD/DVD: "<>setpagedevice" -*PageRegion 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" -*PageRegion 195x270mm/16K 195 x 270 mm: "<>setpagedevice" -*PageRegion 3.5x5/3.5 x 5″: "<>setpagedevice" -*PageRegion 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" -*PageRegion 4x6/4 x 6″: "<>setpagedevice" -*PageRegion 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" -*PageRegion 5x7/5 x 7″: "<>setpagedevice" -*PageRegion 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" -*PageRegion 5x8/5 x 8″: "<>setpagedevice" -*PageRegion 8x10/8 x 10″: "<>setpagedevice" -*PageRegion 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A4.Borderless/A4 (Borderless): "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion A6/A6: "<>setpagedevice" -*PageRegion B5/JIS B5: "<>setpagedevice" -*PageRegion B6/JIS B6: "<>setpagedevice" -*PageRegion Env10/Envelope #10: "<>setpagedevice" -*PageRegion EnvC6/CEnvelope 6: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion FanFoldGermanLegal/Foolscap: "<>setpagedevice" -*PageRegion Legal/US Legal: "<>setpagedevice" -*PageRegion Letter/US Letter: "<>setpagedevice" -*PageRegion Letter.Borderless/US Letter (Borderless): "<>setpagedevice" -*PageRegion Postcard/Hagaki: "<>setpagedevice" -*PageRegion Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" -*CloseUI: *PageRegion -*DefaultImageableArea: A4 -*DefaultPaperDimension: A4 -*ImageableArea 101.6x180.6mm: "8.503937007874 8.503937007874 279.496062992126 503.433070866142" -*PaperDimension 101.6x180.6mm: "288 511.937007874016" -*ImageableArea 101.6x180.6mm.Borderless: "0 0 288 511.937007874016" -*PaperDimension 101.6x180.6mm.Borderless: "288 511.937007874016" -*ImageableArea 120x120mm: "8.503937007874 8.503937007874 331.653543307087 331.653543307087" -*PaperDimension 120x120mm: "340.157480314961 340.157480314961" -*ImageableArea 120x120mm.Borderless: "0 0 340.157480314961 340.157480314961" -*PaperDimension 120x120mm.Borderless: "340.157480314961 340.157480314961" -*ImageableArea 195x270mm: "8.503937007874 8.503937007874 544.251968503937 756.850393700787" -*PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 3.5x5: "8.503937007874 8.503937007874 243.496062992126 351.496062992126" -*PaperDimension 3.5x5: "252 360" -*ImageableArea 3.5x5.Borderless: "0 0 252 360" -*PaperDimension 3.5x5.Borderless: "252 360" -*ImageableArea 4x6: "8.503937007874 8.503937007874 279.496062992126 423.496062992126" -*PaperDimension 4x6: "288 432" -*ImageableArea 4x6.Borderless: "0 0 288 432" -*PaperDimension 4x6.Borderless: "288 432" -*ImageableArea 5x7: "8.503937007874 8.503937007874 351.496062992126 495.496062992126" -*PaperDimension 5x7: "360 504" -*ImageableArea 5x7.Borderless: "0 0 360 504" -*PaperDimension 5x7.Borderless: "360 504" -*ImageableArea 5x8: "8.503937007874 8.503937007874 351.496062992126 567.496062992126" -*PaperDimension 5x8: "360 576" -*ImageableArea 8x10: "8.503937007874 8.503937007874 567.496062992126 711.496062992126" -*PaperDimension 8x10: "576 720" -*ImageableArea 8x10.Borderless: "0 0 576 720" -*PaperDimension 8x10.Borderless: "576 720" -*ImageableArea A4: "8.503937007874 8.503937007874 586.771653543307 833.385826771654" -*PaperDimension A4: "595.275590551181 841.889763779528" -*ImageableArea A4.Borderless: "0 0 595.275590551181 841.889763779528" -*PaperDimension A4.Borderless: "595.275590551181 841.889763779528" -*ImageableArea A5: "8.503937007874 8.503937007874 411.023622047244 586.771653543307" -*PaperDimension A5: "419.527559055118 595.275590551181" -*ImageableArea A6: "8.503937007874 8.503937007874 289.133858267717 411.023622047244" -*PaperDimension A6: "297.637795275591 419.527559055118" -*ImageableArea B5: "8.503937007874 8.503937007874 507.40157480315 720" -*PaperDimension B5: "515.905511811024 728.503937007874" -*ImageableArea B6: "8.503937007874 8.503937007874 354.330708661417 507.40157480315" -*PaperDimension B6: "362.834645669291 515.905511811024" -*ImageableArea Env10: "8.503937007874 8.503937007874 288.48188976378 675.496062992126" -*PaperDimension Env10: "296.985826771654 684" -*ImageableArea EnvC6: "8.503937007874 8.503937007874 314.645669291339 450.708661417323" -*PaperDimension EnvC6: "323.149606299213 459.212598425197" -*ImageableArea EnvDL: "8.503937007874 8.503937007874 303.307086614173 615.11811023622" -*PaperDimension EnvDL: "311.811023622047 623.622047244094" -*ImageableArea FanFoldGermanLegal: "8.503937007874 8.503937007874 603.496062992126 927.496062992126" -*PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea Legal: "8.503937007874 8.503937007874 603.496062992126 999.496062992126" -*PaperDimension Legal: "612 1008" -*ImageableArea Letter: "8.503937007874 8.503937007874 603.496062992126 783.496062992126" -*PaperDimension Letter: "612 792" -*ImageableArea Letter.Borderless: "0 0 612 792" -*PaperDimension Letter.Borderless: "612 792" -*ImageableArea Postcard: "8.503937007874 8.503937007874 274.96062992126 411.023622047244" -*PaperDimension Postcard: "283.464566929134 419.527559055118" -*ImageableArea Postcard.Borderless: "0 0 283.464566929134 419.527559055118" -*PaperDimension Postcard.Borderless: "283.464566929134 419.527559055118" -*HWMargins: "8.503937007874 8.503937007874 8.503937007874 8.503937007874" -*ParamCustomPageSize Width: 1 points 153.070866141732 612 -*ParamCustomPageSize Height: 2 points 243.779527559055 3401.574803149606 -*ParamCustomPageSize WidthOffset: 3 points 0 0 -*ParamCustomPageSize HeightOffset: 4 points 0 0 -*ParamCustomPageSize Orientation: 5 int 0 3 -*CustomPageSize True: "pop pop pop <>setpagedevice" -*OpenUI *InputSlot/Media Source: PickOne -*OrderDependency: 10 AnySetup *InputSlot -*DefaultInputSlot: Main -*InputSlot Auto/Automatic: "<>setpagedevice" -*InputSlot Main/Main: "<>setpagedevice" -*InputSlot Photo/Photo: "<>setpagedevice" -*InputSlot Rear/Rear: "<>setpagedevice" -*InputSlot Disc/Disc: "<>setpagedevice" -*CloseUI: *InputSlot -*OpenUI *MediaType/Media Type: PickOne -*OrderDependency: 10 AnySetup *MediaType -*DefaultMediaType: Stationery -*MediaType Stationery/Stationery: "<>setpagedevice" -*MediaType PhotographicHighGloss/High Gloss Photo Paper: "<>setpagedevice" -*MediaType Photographic/Photo Paper: "<>setpagedevice" -*MediaType PhotographicSemiGloss/Semi-Gloss Photo Paper: "<>setpagedevice" -*MediaType PhotographicGlossy/Glossy Photo Paper: "<>setpagedevice" -*MediaType PhotographicMatte/Matte Photo Paper: "<>setpagedevice" -*MediaType StationeryCoated/Coated Paper: "<>setpagedevice" -*MediaType Labels/Labels: "<>setpagedevice" -*MediaType Envelope/Envelope: "<>setpagedevice" -*MediaType Disc/Optical Disc: "<>setpagedevice" -*CloseUI: *MediaType -*% ColorModel from urf-supported -*OpenUI *ColorModel/Print Color Mode: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*ColorModel RGB/Color: "<>setpagedevice" -*ColorModel Gray/Monochrome: "<>setpagedevice" -*DefaultColorModel: RGB -*CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Off: "<>setpagedevice" -*Duplex DuplexNoTumble/On (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/On (Landscape): "<>setpagedevice" -*CloseUI: *Duplex -*cupsBackSide: Rotated -*OpenUI *OutputBin/Output Tray: PickOne -*OrderDependency: 10 AnySetup *OutputBin -*DefaultOutputBin: FaceUp -*OutputBin FaceUp/Face Up: "" -*PageStackOrder FaceUp: Normal -*CloseUI: *OutputBin -*DefaultResolution: 360dpi -*OpenUI *cupsPrintQuality/Print Quality: PickOne -*OrderDependency: 10 AnySetup *cupsPrintQuality -*DefaultcupsPrintQuality: Normal -*cupsPrintQuality Normal/Normal: "<>setpagedevice" -*cupsPrintQuality High/High: "<>setpagedevice" -*CloseUI: *cupsPrintQuality -*OpenUI *print-scaling/Print Scaling: PickOne -*OrderDependency: 10 AnySetup *print-scaling -*Defaultprint-scaling: auto -*print-scaling auto/Automatic: "" -*print-scaling auto-fit/Auto-fit: "" -*print-scaling fill/Fill: "" -*print-scaling fit/Fit: "" -*print-scaling none/None: "" -*CloseUI: *print-scaling -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/printers.conf b/cups/printers.conf index dcc70d0c..0cfcd43a 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,25 +1,4 @@ # Printer configuration file for CUPS v2.3.3op2 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -NextPrinterId 105 - -PrinterId 104 -UUID urn:uuid:f5371011-32aa-338f-71d2-5722bca11664 -Info EPSON_XP_8600_Series -Location -MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 -DeviceURI implicitclass://EPSON_XP_8600_Series/ -State Idle -StateTime 1662726342 -ConfigTime 1662726342 -Type 36892 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true - +NextPrinterId 106 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index c999d977..5a0da840 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,4 +1,25 @@ # Printer configuration file for CUPS v2.3.3op2 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -NextPrinterId 104 +NextPrinterId 106 + +PrinterId 105 +UUID urn:uuid:7416f6c1-b745-39c1-5853-c651f5e514ed +Info EPSON_XP_8600_Series +Location +MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 +DeviceURI implicitclass://EPSON_XP_8600_Series/ +State Idle +StateTime 1663506285 +ConfigTime 1663506285 +Type 36892 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + diff --git a/forticlient/config.db b/forticlient/config.db index dafdd3051bf10eff4cccc3c3ec21b47b647a4bbf..759076816984722c4b10e15c42ef460bb25e65c5 100644 GIT binary patch delta 36 scmZp8z}E19ZGtpo^F$eE#^%O^tqF`DW!a5Q4GoPA&9+C#F|L>h0P%VZM*si- delta 36 scmZp8z}E19ZGtpo<3t%}#>U2ktqF`DW!a6)jZ7`fEw@L=F|L>h0P)BSR{#J2