From: mhoellein Date: Sat, 30 Apr 2022 20:53:06 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=0d8f1ff5c19464d5efb3cc7730dd8707c8878f26;p=homeserver saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 69f5511d..b4db5b99 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2104,8 +2104,6 @@ maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O' maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O' maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd' maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd' -maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O' -maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O' maybe chgrp 'lp' 'cups/printers.conf' maybe chmod 0600 'cups/printers.conf' maybe chgrp 'lp' 'cups/printers.conf.O' @@ -3338,7 +3336,6 @@ maybe chmod 0755 'init.d/lvm2' maybe chmod 0755 'init.d/lvm2-lvmetad' maybe chmod 0755 'init.d/lvm2-lvmpolld' maybe chmod 0755 'init.d/mintsystem' -maybe chmod 0755 'init.d/mosquitto' maybe chmod 0755 'init.d/mountall-bootclean.sh' maybe chmod 0755 'init.d/mountall.sh' maybe chmod 0755 'init.d/mountdevsubfs.sh' @@ -3435,7 +3432,6 @@ maybe chmod 0644 'init/isc-dhcp-server.conf' maybe chmod 0644 'init/isc-dhcp-server6.conf' maybe chmod 0644 'init/lightdm.conf' maybe chmod 0644 'init/modemmanager.conf' -maybe chmod 0644 'init/mosquitto.conf' maybe chmod 0644 'init/mountall-bootclean.sh.conf' maybe chmod 0644 'init/mountall-net.conf' maybe chmod 0644 'init/mountall-reboot.conf' @@ -11216,7 +11212,6 @@ maybe chmod 0644 'logrotate.d/icinga2' maybe chmod 0644 'logrotate.d/iptraf' maybe chmod 0644 'logrotate.d/iptraf-ng' maybe chmod 0644 'logrotate.d/lightdm' -maybe chmod 0644 'logrotate.d/mosquitto' maybe chmod 0644 'logrotate.d/mysql-server' maybe chmod 0644 'logrotate.d/oscam' maybe chmod 0644 'logrotate.d/php7.2-fpm' @@ -11339,14 +11334,6 @@ maybe chmod 0644 'mono/4.5/web.config' maybe chmod 0644 'mono/browscap.ini' maybe chmod 0755 'mono/certstore' maybe chmod 0644 'mono/config' -maybe chmod 0755 'mosquitto' -maybe chmod 0755 'mosquitto/ca_certificates' -maybe chmod 0644 'mosquitto/ca_certificates/README' -maybe chmod 0755 'mosquitto/certs' -maybe chmod 0644 'mosquitto/certs/README' -maybe chmod 0755 'mosquitto/conf.d' -maybe chmod 0644 'mosquitto/conf.d/README' -maybe chmod 0644 'mosquitto/mosquitto.conf' maybe chmod 0644 'mtools.conf' maybe chmod 0755 'mysql' maybe chmod 0755 'mysql/conf.d' diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O deleted file mode 100644 index af25729b..00000000 --- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O +++ /dev/null @@ -1,190 +0,0 @@ -*PPD-Adobe: "4.3" -*FormatVersion: "4.3" -*FileVersion: "1.20.2" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PSVersion: "(3010.000) 0" -*LanguageLevel: "3" -*FileSystem: False -*PCFileName: "drvless.ppd" -*Manufacturer: "HP" -*ModelName: "HP Color LaserJet MFP M277dw" -*Product: "(HP Color LaserJet MFP M277dw)" -*NickName: "HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2" -*ShortNickName: "HP Color LaserJet MFP M277dw" -*ColorDevice: True -*cupsVersion: 2.2 -*cupsSNMPSupplies: False -*cupsLanguages: "en" -*APSupplies: "https://NPI9D0E59.local:443/hp/device/info_config_AirPrint.html?tab=Networking&menu=AirPrintStatus" -*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" -*cupsFilter2: "image/urf image/urf 100 -" -*cupsFilter2: "application/PCLm application/PCLm 200 -" -*cupsFilter2: "application/vnd.cups-pdf application/vnd.hp-pclxl 300 gstopxl" -*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -" -*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx" -*cupsFilter2: "image/jpeg image/jpeg 0 -" -*cupsPclmRasterBackSide: normal -*cupsPclmCompressionMethodPreferred: flate -*cupsPclmSourceResolutionSupported: 600dpi -*cupsPclmStripHeightPreferred: 64 -*cupsPclmStripHeightSupported: "16,32,64,128" -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: A4 -*PageSize 100x150mm: "<>setpagedevice" -*PageSize 184x260mm: "<>setpagedevice" -*PageSize 195x270mm: "<>setpagedevice" -*PageSize 4x6: "<>setpagedevice" -*PageSize 5x8: "<>setpagedevice" -*PageSize A4: "<>setpagedevice" -*PageSize A5: "<>setpagedevice" -*PageSize A6: "<>setpagedevice" -*PageSize B5: "<>setpagedevice" -*PageSize B6: "<>setpagedevice" -*PageSize DoublePostcardRotated: "<>setpagedevice" -*PageSize Env10: "<>setpagedevice" -*PageSize EnvC5: "<>setpagedevice" -*PageSize EnvDL: "<>setpagedevice" -*PageSize EnvMonarch: "<>setpagedevice" -*PageSize Executive: "<>setpagedevice" -*PageSize FanFoldGermanLegal: "<>setpagedevice" -*PageSize ISOB5: "<>setpagedevice" -*PageSize Legal: "<>setpagedevice" -*PageSize Letter: "<>setpagedevice" -*PageSize Oficio: "<>setpagedevice" -*PageSize Postcard: "<>setpagedevice" -*PageSize roc16k: "<>setpagedevice" -*CloseUI: *PageSize -*OpenUI *PageRegion/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: A4 -*PageRegion 100x150mm: "<>setpagedevice" -*PageRegion 184x260mm: "<>setpagedevice" -*PageRegion 195x270mm: "<>setpagedevice" -*PageRegion 4x6: "<>setpagedevice" -*PageRegion 5x8: "<>setpagedevice" -*PageRegion A4: "<>setpagedevice" -*PageRegion A5: "<>setpagedevice" -*PageRegion A6: "<>setpagedevice" -*PageRegion B5: "<>setpagedevice" -*PageRegion B6: "<>setpagedevice" -*PageRegion DoublePostcardRotated: "<>setpagedevice" -*PageRegion Env10: "<>setpagedevice" -*PageRegion EnvC5: "<>setpagedevice" -*PageRegion EnvDL: "<>setpagedevice" -*PageRegion EnvMonarch: "<>setpagedevice" -*PageRegion Executive: "<>setpagedevice" -*PageRegion FanFoldGermanLegal: "<>setpagedevice" -*PageRegion ISOB5: "<>setpagedevice" -*PageRegion Legal: "<>setpagedevice" -*PageRegion Letter: "<>setpagedevice" -*PageRegion Oficio: "<>setpagedevice" -*PageRegion Postcard: "<>setpagedevice" -*PageRegion roc16k: "<>setpagedevice" -*CloseUI: *PageRegion -*DefaultImageableArea: A4 -*DefaultPaperDimension: A4 -*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598" -*PaperDimension 100x150mm: "283.464566929134 425.196850393701" -*ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646" -*PaperDimension 184x260mm: "521.574803149606 737.007874015748" -*ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559" -*PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 4x6: "11.990551181102 11.990551181102 276.009448818898 420.009448818898" -*PaperDimension 4x6: "288 432" -*ImageableArea 5x8: "11.990551181102 11.990551181102 348.009448818898 564.009448818898" -*PaperDimension 5x8: "360 576" -*ImageableArea A4: "11.990551181102 11.990551181102 583.285039370079 829.899212598425" -*PaperDimension A4: "595.275590551181 841.889763779528" -*ImageableArea A5: "11.990551181102 11.990551181102 407.537007874016 583.285039370079" -*PaperDimension A5: "419.527559055118 595.275590551181" -*ImageableArea A6: "11.990551181102 11.990551181102 285.647244094488 407.537007874016" -*PaperDimension A6: "297.637795275591 419.527559055118" -*ImageableArea B5: "11.990551181102 11.990551181102 503.914960629921 716.513385826772" -*PaperDimension B5: "515.905511811024 728.503937007874" -*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921" -*PaperDimension B6: "362.834645669291 515.905511811024" -*ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165" -*PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268" -*ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898" -*PaperDimension Env10: "296.985826771654 684" -*ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614" -*PaperDimension EnvC5: "459.212598425197 649.133858267717" -*ImageableArea EnvDL: "11.990551181102 11.990551181102 299.820472440945 611.631496062992" -*PaperDimension EnvDL: "311.811023622047 623.622047244094" -*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898" -*PaperDimension EnvMonarch: "278.985826771654 540" -*ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898" -*PaperDimension Executive: "522 756" -*ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898" -*PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732" -*PaperDimension ISOB5: "498.897637795276 708.661417322835" -*ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898" -*PaperDimension Legal: "612 1008" -*ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898" -*PaperDimension Letter: "612 792" -*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" -*PaperDimension Oficio: "612 964.8" -*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016" -*PaperDimension Postcard: "283.464566929134 419.527559055118" -*ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898" -*PaperDimension roc16k: "558 774" -*HWMargins: "11.990551181102 11.990551181102 11.990551181102 11.990551181102" -*ParamCustomPageSize Width: 1 points 216 612 -*ParamCustomPageSize Height: 2 points 360 1008 -*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: Auto -*InputSlot Auto/Automatic: "<>setpagedevice" -*InputSlot Manual/Manual: "<>setpagedevice" -*InputSlot Tray-1: "" -*InputSlot Tray-2: "" -*CloseUI: *InputSlot -*OpenUI *ColorModel/Color Mode: PickOne -*OrderDependency: 10 AnySetup *ColorModel -*ColorModel Gray/Grayscale: "<>setpagedevice" -*ColorModel AdobeRGB/Deep Color (Wide Color Gamut, AdobeRGB): "<>setpagedevice" -*ColorModel DeviceRGB/Device RGB: "<>setpagedevice" -*ColorModel DeviceGray/Device Gray: "<>setpagedevice" -*ColorModel RGB/Color: "<>setpagedevice" -*DefaultColorModel: RGB -*CloseUI: *ColorModel -*OpenUI *Duplex/2-Sided Printing: PickOne -*OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Off (1-Sided): "<>setpagedevice" -*Duplex DuplexNoTumble/Long-Edge (Portrait): "<>setpagedevice" -*Duplex DuplexTumble/Short-Edge (Landscape): "<>setpagedevice" -*CloseUI: *Duplex -*cupsBackSide: Normal -*DefaultResolution: 600dpi -*OpenUI *cupsPrintQuality/Print Quality: PickOne -*OrderDependency: 10 AnySetup *cupsPrintQuality -*DefaultcupsPrintQuality: 4 -*cupsPrintQuality 3/Draft: "<>setpagedevice" -*cupsPrintQuality 4/Normal: "<>setpagedevice" -*CloseUI: *cupsPrintQuality -*OpenUI *print-content-optimize/Print Optimization: PickOne -*OrderDependency: 10 AnySetup *print-content-optimize -*Defaultprint-content-optimize: auto -*print-content-optimize auto/Automatic: "" -*print-content-optimize photo/Photo: "" -*print-content-optimize graphics/Graphics: "" -*print-content-optimize text/Text: "" -*print-content-optimize text-and-graphics/Text And Graphics: "" -*CloseUI: *print-content-optimize -*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 diff --git a/cups/printers.conf b/cups/printers.conf index b1bb5655..ade463bf 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -3,8 +3,7 @@ # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:b89eca21-fb25-3f10-483b-b060c6ca3210 -Info -Location +Info HP_Color_LaserJet_MFP_M277dw_9D0E59_ MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle @@ -21,14 +20,14 @@ OpPolicy default ErrorPolicy retry-job -UUID urn:uuid:572711b7-6442-319c-4186-bccbd438a11c +UUID urn:uuid:12c9a57f-4e13-3ca5-738e-e20e1dd3bba7 Info Location MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2 DeviceURI ipps://NPI9D0E59.local:443/ipp/print State Idle -StateTime 1651351494 -ConfigTime 1651351494 +StateTime 1651351861 +ConfigTime 1651351862 Type 8425564 Accepting Yes Shared No diff --git a/cups/printers.conf.O b/cups/printers.conf.O index f272bb51..44e40967 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -9,7 +9,7 @@ MakeModel Color LaserJet MFP M277dw DeviceURI ipp://NPI9D0E59.local:631/ipp/print State Idle StateTime 1650925011 -ConfigTime 1650925014 +ConfigTime 1651351488 Type 4188 Accepting Yes Shared No @@ -19,5 +19,4 @@ PageLimit 0 KLimit 0 OpPolicy default ErrorPolicy retry-job -Option cups-browsed true diff --git a/init.d/mosquitto b/init.d/mosquitto deleted file mode 100755 index 5613d19f..00000000 --- a/init.d/mosquitto +++ /dev/null @@ -1,138 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: mosquitto -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: mosquitto MQTT v3.1 message broker -# Description: -# This is a message broker that supports version 3.1 of the MQ Telemetry -# Transport (MQTT) protocol. -# -# MQTT provides a method of carrying out messaging using a publish/subscribe -# model. It is lightweight, both in terms of bandwidth usage and ease of -# implementation. This makes it particularly useful at the edge of the network -# where a sensor or other simple device may be implemented using an arduino for -# example. -### END INIT INFO - -set -e - -PIDFILE=/var/run/mosquitto.pid -DAEMON=/usr/sbin/mosquitto - -# /etc/init.d/mosquitto: start and stop the mosquitto MQTT message broker - -test -x ${DAEMON} || exit 0 - -umask 022 - -. /lib/lsb/init-functions - -# Are we running from init? -run_by_init() { - ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] -} - -export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" - -case "$1" in - start) - if init_is_upstart; then - exit 1 - fi - log_daemon_msg "Starting network daemon:" "mosquitto" - if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then - log_end_msg 0 - else - log_end_msg 1 - fi - ;; - stop) - if init_is_upstart; then - exit 0 - fi - log_daemon_msg "Stopping network daemon:" "mosquitto" - if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}; then - log_end_msg 0 - rm -f ${PIDFILE} - else - log_end_msg 1 - fi - ;; - - - reload|force-reload) - if init_is_upstart; then - exit 1 - fi - log_daemon_msg "Reloading network daemon configuration:" "mosquitto" - if start-stop-daemon --stop --signal HUP --quiet --oknodo --pidfile $PIDFILE; then - log_end_msg 0 - else - log_end_msg 1 - fi - ;; - - restart) - if init_is_upstart; then - exit 1 - fi - log_daemon_msg "Restarting network daemon:" "mosquitto" - if start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${PIDFILE}; then - rm -f ${PIDFILE} - fi - if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then - log_end_msg 0 - else - log_end_msg 1 - fi - ;; - - try-restart) - if init_is_upstart; then - exit 1 - fi - log_daemon_msg "Restarting Mosquitto message broker" "mosquitto" - set +e - start-stop-daemon --stop --quiet --retry 30 --pidfile ${PIDFILE} - RET="$?" - set -e - case $RET in - 0) - # old daemon stopped - rm -f ${PIDFILE} - if start-stop-daemon --start --quiet --oknodo --background --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON} -- -c /etc/mosquitto/mosquitto.conf ; then - log_end_msg 0 - else - log_end_msg 1 - fi - ;; - 1) - # daemon not running - log_progress_msg "(not running)" - log_end_msg 0 - ;; - *) - # failed to stop - log_progress_msg "(failed to stop)" - log_end_msg 1 - ;; - esac - ;; - - status) - if init_is_upstart; then - exit 1 - fi - status_of_proc -p ${PIDFILE} ${DAEMON} mosquitto && exit 0 || exit $? - ;; - - *) - log_action_msg "Usage: /etc/init.d/mosquitto {start|stop|reload|force-reload|restart|try-restart|status}" - exit 1 -esac - -exit 0 diff --git a/init/mosquitto.conf b/init/mosquitto.conf deleted file mode 100644 index 5752ad5c..00000000 --- a/init/mosquitto.conf +++ /dev/null @@ -1,8 +0,0 @@ -description "Mosquitto MQTTv3.1 broker" -author "Roger Light