From: root Date: Wed, 26 Aug 2020 13:06:43 +0000 (+0200) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=09ec2668d3d86fd8e6b63af3df482287d0a00cc8;p=zenbook daily autocommit --- diff --git a/.etckeeper b/.etckeeper index d1f5831..0f8c631 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2,8 +2,6 @@ mkdir -p './NetworkManager/VPN' mkdir -p './NetworkManager/dispatcher.d/no-wait.d' -mkdir -p './NetworkManager/dispatcher.d/pre-down.d' -mkdir -p './NetworkManager/dispatcher.d/pre-up.d' mkdir -p './NetworkManager/dnsmasq-shared.d' mkdir -p './NetworkManager/dnsmasq.d' mkdir -p './ODBCDataSources' @@ -150,7 +148,9 @@ maybe chmod 0755 'NetworkManager/conf.d' maybe chmod 0644 'NetworkManager/conf.d/10-globally-managed-devices.conf' maybe chmod 0644 'NetworkManager/conf.d/default-wifi-powersave-on.conf' maybe chmod 0755 'NetworkManager/dispatcher.d' +maybe chmod 0755 'NetworkManager/dispatcher.d/00-logger' maybe chmod 0755 'NetworkManager/dispatcher.d/01-ifupdown' +maybe chmod 0755 'NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh' maybe chmod 0755 'NetworkManager/dispatcher.d/99-backupPicture.sh' maybe chmod 0755 'NetworkManager/dispatcher.d/no-wait.d' maybe chmod 0755 'NetworkManager/dispatcher.d/ntp' diff --git a/NetworkManager/dispatcher.d/00-logger b/NetworkManager/dispatcher.d/00-logger new file mode 100755 index 0000000..bd0536a --- /dev/null +++ b/NetworkManager/dispatcher.d/00-logger @@ -0,0 +1,51 @@ +#! /bin/dash -e +# Script to dispatch NetworkManager events +# +# /etc/NetworkManager/dispatcher.d/00-logger +# logs calls to syslog. +# See NetworkManager(8) for further documentation of the dispatcher events. + +# SPDX-License-Identifier: GPL-2.0-or-later +# (c) 2020 kB @ ubuntuusers.de + +myName=${0##*/} +: ${PATH:=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin} + +#LOG() logger --tag="nm-dispatcher-script" --id=$PPID "$@" +#LOG() logger --tag="nm-dispatcher-script [$PPID]" --id=$$ "$@" +LOG() logger --tag="$myName [$$]" --id=$PPID "$@" +ERROR() LOG -p user.err -- "$@" # 3 +WARN() LOG -p user.warning -- "$@" # 4 +NOTE() LOG -p user.notice -- "$@" # 5* +INFO() LOG -p user.info -- "$@" # 6 +DEBUG() LOG -p user.debug -- "$@" # 7 +DIE() { ERROR $0 $* ; false ;} + +put_symlink_in() \ + for dir + do dir=/etc/NetworkManager/dispatcher.d/${dir}.d + test -e $dir/$myName || ln -s $0 $dir/ + done + +test $myName = 00-logger && +{ DEBUG $0 $* start. + case $2 in (vpn*) NOTE "$2 $DEVICE_IP_IFACE/$DEVICE_IFACE/$1/$CONNECTION_ID " + ip -4 route | NOTE + esac + case $2 in ('') DIE no action found. # Should never happen. + ;; (hostname) NOTE Hostname: $(hostname) + ;; (connectivity*) NOTE Netzanbindung: $CONNECTIVITY_STATE + { ip -6 route ; ip -4 route ;} | INFO + ;; (dhcp4*) NOTE DHCP4 $1 + #printenv | grep DHCP4 | DEBUG + ;; (dhcp6*) NOTE DHCP6 $1 + #printenv | grep DHCP6 | DEBUG + ;; (*up|*down) { echo -n "$1/$CONNECTION_ID " + nmcli --get-values general.state device show $1 | + sed 's/^[^(]*(//; s/)$//' + } | NOTE + ;; (*) WARN 1=$1, 2=$2. + esac + put_symlink_in pre-up pre-down + DEBUG $0 $* endet. +} || DEBUG 00-logger sourced. diff --git a/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh b/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh new file mode 100755 index 0000000..c6a1f33 --- /dev/null +++ b/NetworkManager/dispatcher.d/70-wifi-wired-exclusive.sh @@ -0,0 +1,23 @@ +#!/bin/bash +export LC_ALL=C + +disable=false + + + +enable_disable_wifi () { + result=$(nmcli dev | grep "ethernet" | grep -w "connected") + if [ -n "$result" ]; then + nmcli radio wifi off + else + nmcli radio wifi on + fi +} + +if [ "$2" = "up" -a "$disable" = "false" ]; then + enable_disable_wifi +fi + +if [ "$2" = "down" -a "$disable" = "false" ]; then + enable_disable_wifi +fi diff --git a/NetworkManager/dispatcher.d/99-backupPicture.sh b/NetworkManager/dispatcher.d/99-backupPicture.sh index 5e1def8..1aee691 100755 --- a/NetworkManager/dispatcher.d/99-backupPicture.sh +++ b/NetworkManager/dispatcher.d/99-backupPicture.sh @@ -8,8 +8,11 @@ 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" + 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) exit 0 fi - -#Backup /home/mhoellein/Bilder mit borg -echo "backup /home/mhoellein/Bilder | systemd-cat -p info -t backup" diff --git a/NetworkManager/dispatcher.d/pre-down.d/00-logger b/NetworkManager/dispatcher.d/pre-down.d/00-logger new file mode 120000 index 0000000..54f8561 --- /dev/null +++ b/NetworkManager/dispatcher.d/pre-down.d/00-logger @@ -0,0 +1 @@ +/etc/NetworkManager/dispatcher.d/00-logger \ No newline at end of file diff --git a/NetworkManager/dispatcher.d/pre-up.d/00-logger b/NetworkManager/dispatcher.d/pre-up.d/00-logger new file mode 120000 index 0000000..54f8561 --- /dev/null +++ b/NetworkManager/dispatcher.d/pre-up.d/00-logger @@ -0,0 +1 @@ +/etc/NetworkManager/dispatcher.d/00-logger \ No newline at end of file diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 979eb69..824c2c7 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 108 +NextPrinterId 117 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 1597910771 +StateTime 1598209967 ConfigTime 1590465380 Type 8425500 Accepting Yes @@ -97,6 +97,48 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job + +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 + + +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 + PrinterId 7 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065