From: root <root@localhost>
Date: Thu, 27 Aug 2020 19:29:53 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=0b5e858827eb160b740b3fd22b3cb53fe5487367;p=zenbook

daily autocommit
---

diff --git a/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh b/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh
index c6a1f33..f35d67c 100755
--- a/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh
+++ b/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 export LC_ALL=C
 
-disable=false
+disable=true
 
 
 
diff --git a/NetworkManager/dispatcher.d/99-backupPicture.sh b/NetworkManager/dispatcher.d/99-backupPicture.sh
index 1aee691..56e5aed 100755
--- a/NetworkManager/dispatcher.d/99-backupPicture.sh
+++ b/NetworkManager/dispatcher.d/99-backupPicture.sh
@@ -3,16 +3,14 @@
 interface=$1
 event=$2
 
-echo "$interface received $event" | systemd-cat -p info -t dispatch_script
-
 #wenn wlan up und mit moellein verbunden -> daher zu Hause
 if [[ $interface != "wlp2s0" ]] && [[ $event != "up" ]] && [[ $CONNECTION_UUID != "d8c88d94-378a-4373-98ce-79a7bf9e431b" ]]
 then
 	echo "backup /home/mhoellein/Bilder | systemd-cat -p info -t backup"
 	SCRIPTNAME=${0##*/}
-	BACKUP_DIR="/home/mhoellein/Bilder/ .local/share/shotwell/"
-	TMPFILE="/tmp/$SCRIPTNAME.$(date +%Y%m%d).log"
+	BACKUP_DIR="/home/mhoellein/Bilder/ /home/mhoellein/.local/share/shotwell/"
 	LOGFILE="/var/log/$SCRIPTNAME.$(date +%Y%m%d).log"
-	borg create --stats ssh://borg@vserver2.hoellein.online:22/home/borg/Bilder::$(date +%Y-%m-%d_%H:%m) ${BACKUP_DIR} >>$TMPFILE 2> >( tee -a $TMPFILE >&2) 
+	export BORG_PASSPHRASE=m88vS3intruder0503susi0503
+	borg create --stats ssh://borg@vserver2.hoellein.online:22/home/borg/Bilder::$(date +%Y-%m-%d_%H:%m) ${BACKUP_DIR} >> $LOGFILE 2>&1 
 	exit 0
 fi
diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 824c2c7..b48bf66 100644
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 117
+NextPrinterId 119
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -85,7 +85,7 @@ Info HP Color LaserJet MFP M277dw
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI socket://192.168.178.254
 State Idle
-StateTime 1598209967
+StateTime 1598539231
 ConfigTime 1590465380
 Type 8425500
 Accepting Yes
@@ -97,48 +97,6 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer hp8>
-PrinterId 116
-UUID urn:uuid:10c96545-0bde-3915-7500-2d0cd1612547
-Info 
-Location 
-MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp8/
-State Idle
-StateTime 1598424808
-ConfigTime 1598424808
-Type 8400988
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
-<Printer hp_LaserJet_9040_8BFB3E_>
-PrinterId 115
-UUID urn:uuid:027c39f0-611e-3d65-74fe-a4b2a1ab76e2
-Info 
-Location 
-MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
-State Idle
-StateTime 1598422164
-ConfigTime 1598422164
-Type 8400988
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
 <Printer HP_LaserJet_M806_17B98C_>
 PrinterId 7
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065