saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 5383ddafe3c3f12dd1d590000567202f9bf81eb9..fcd4a882f8452729cdad520c50667d92e1efb619 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -75,7 +75,6 @@ mkdir -p './security/namespace.d'
 mkdir -p './smartmontools/smartd_warning.d'
 mkdir -p './ssh/ssh_config.d'
 mkdir -p './ssh/sshd_config.d'
-mkdir -p './systemd/network'
 mkdir -p './udev/hwdb.d'
 mkdir -p './update-notifier'
 mkdir -p './usb_modeswitch.d'
@@ -3214,6 +3213,7 @@ maybe chmod 0755 'systemd'
 maybe chmod 0644 'systemd/journald.conf'
 maybe chmod 0644 'systemd/logind.conf'
 maybe chmod 0755 'systemd/network'
+maybe chmod 0644 'systemd/network/br0.network'
 maybe chmod 0644 'systemd/networkd.conf'
 maybe chmod 0644 'systemd/pstore.conf'
 maybe chmod 0644 'systemd/resolved.conf'

diff --git a/NetworkManager/system-connections/System bridge br0 b/NetworkManager/system-connections/System bridge br0
index 55576dfe61ea3ffcabd2de128bc44528fb970dd9..059610c29f03e475fbbbb36feeed0efd5e4da574 100644 (file)
--- a/NetworkManager/system-connections/System bridge br0
+++ b/NetworkManager/system-connections/System bridge br0
@@ -3,22 +3,19 @@ id=br0
 uuid=3a486180-bfcb-4c6b-9f82-9c5cf776fe86
 type=bridge
 interface-name=br0
-permissions=
-timestamp=1618296123
+timestamp=1661267404
 
 [bridge]
 
 [ipv4]
 address1=10.12.11.2/24,10.12.11.254
-dns=127.0.0.1;
+dns=1.1.1.1;8.8.8.8;9.9.9.9;
 dns-search=home.brehm-online.com;brehm-online.com;hennig-berlin.org;uhu-banane.de;uhu-banane.net;
-ignore-auto-dns=true
 may-fail=false
 method=manual
 
 [ipv6]
 addr-gen-mode=stable-privacy
-dns=::1;
 dns-search=home.brehm-online.com;brehm-online.com;uhu-banane.de;uhu-banane.net;
 ignore-auto-dns=true
 may-fail=false

diff --git a/NetworkManager/system-connections/VPN-DPX.nmconnection b/NetworkManager/system-connections/VPN-DPX.nmconnection
index bd77904896b6ee26bd164bae56db32a86aa9a091..960dd78845ade5c5ccdb1a61602a6b935ccd4221 100644 (file)
--- a/NetworkManager/system-connections/VPN-DPX.nmconnection
+++ b/NetworkManager/system-connections/VPN-DPX.nmconnection
@@ -3,7 +3,7 @@ id=DPX
 uuid=9fbcc573-2951-4611-8351-465adb1308dc
 type=vpn
 autoconnect=false
-timestamp=1660638075
+timestamp=1661269845
 
 [vpn]
 gateway=93.188.110.49
@@ -17,7 +17,12 @@ service-type=org.freedesktop.NetworkManager.fortisslvpn
 [ipv4]
 dns=77.74.232.24;77.74.232.25;93.188.104.82;
 dns-search=pixelpark.net;pixelpark.com;pixelpark.de;
+ignore-auto-dns=true
 method=auto
+never-default=true
+route1=77.74.232.0/21,169.254.2.1
+route2=93.188.104.0/21,169.254.2.1
+route3=217.66.48.0/20,169.254.2.1
 
 [ipv6]
 addr-gen-mode=stable-privacy

diff --git a/NetworkManager/system-connections/eth0 b/NetworkManager/system-connections/eth0
index c9b8a5afe99595ec209bd2ec9333f0e979b841e7..ce22231195deadfe61d67b6222d1d8cde99fa73c 100644 (file)
--- a/NetworkManager/system-connections/eth0
+++ b/NetworkManager/system-connections/eth0
@@ -4,10 +4,9 @@ uuid=b63cbb5d-c78f-4a67-9902-ba30b60926e3
 type=ethernet
 interface-name=enp3s0
 master=3a486180-bfcb-4c6b-9f82-9c5cf776fe86
-permissions=
 slave-type=bridge
+timestamp=1661267104
 
 [ethernet]
-mac-address-blacklist=
 
 [bridge-port]

diff --git a/apparmor.d/local/usr.sbin.named b/apparmor.d/local/usr.sbin.named
index 862964adfe3730abe58e50cd8a38bd2383e64843..88d0585d4fde02d01c8be49b1c9b3818b74d2cf7 100644 (file)
--- a/apparmor.d/local/usr.sbin.named
+++ b/apparmor.d/local/usr.sbin.named
@@ -1,3 +1,5 @@
 # /var/lib/samba/private/** rwmk,
 # /usr/lib/x86_64-linux-gnu/** rwmk,
 # /dev/urandom rwmk,
+/var/log/bind/** rw,
+/var/log/bind/ rw,

diff --git a/apparmor.d/usr.sbin.named b/apparmor.d/usr.sbin.named
index 0d80fca718ed85a3515e962b59ba463f0d66529b..6c95d3ad2c34537646ce0159be1a962193ebc0a1 100644 (file)
--- a/apparmor.d/usr.sbin.named
+++ b/apparmor.d/usr.sbin.named
@@ -57,7 +57,7 @@ profile named /usr/sbin/named flags=(attach_disconnected) {
   # syslog do the heavy lifting.
   /var/log/named/** rw,
   /var/log/named/ rw,
-  /var/log/bind/** rw,
+  /var/log/bind/** ra,
   /var/log/bind/ rw,
 
   # gssapi

diff --git a/bind/named-log.conf b/bind/named-log.conf
index ca2cc6f9cf06df908cbbfcb7f0bc83c34b2bab3e..0424aa00aa4edcc37feb903e5d45e2d3c7efc6c4 100644 (file)
--- a/bind/named-log.conf
+++ b/bind/named-log.conf
@@ -14,13 +14,13 @@ logging {
        //---------------------------------------
        // Channels
 
-       channel complete_debug {
-               file "/var/log/bind/complete-debug.log";
-               print-category yes;
-               print-severity yes;
-               print-time yes;
-               severity debug 99;
-       };
+//     channel complete_debug {
+//             file "/var/log/bind/complete-debug.log";
+//             print-category yes;
+//             print-severity yes;
+//             print-time yes;
+//             severity debug 99;
+//     };
 
        channel logtofile {
                file "/var/log/bind/named.log";

diff --git a/bind/named.conf.options b/bind/named.conf.options
index 0e779e63a5898e57bf320d4cbe5dd923efab1b64..9228ba45019e43ff162e2c6c8c3bb85fb8ba7e07 100644 (file)
--- a/bind/named.conf.options
+++ b/bind/named.conf.options
@@ -21,7 +21,7 @@ options {
        dnssec-validation auto;
 
        listen-on-v6 { any; };
-       listen-on { any; };
+       listen-on { 127.0.0.1; 10.12.11.2; };
 };
 
 //###############################################################

diff --git a/cups/printers.conf b/cups/printers.conf
index 534ab3cf8d5c61db6522c0e049fc7eb3b57afcfb..20e34d84dd48d6dfe533290e9f2bd382ac4f01b2 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -33,7 +33,7 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1660752478
+StateTime 1661274651
 ConfigTime 1660637240
 Reason wifi-not-configured-report
 Type 8425500

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 7cd73d054d088f1a882abc3f8cd1dfd6f3eaeba0..ec1f27ff2ceffc21f6aa3934411ccaa0d8218806 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -33,9 +33,10 @@ Location Arbeitszimmer
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8
 State Idle
-StateTime 1660752387
+StateTime 1661274033
 ConfigTime 1660637240
 Reason wifi-not-configured-report
+Reason cups-waiting-for-job-completed
 Type 8425500
 Accepting Yes
 Shared No

diff --git a/systemd/network/br0.network b/systemd/network/br0.network
new file mode 100644 (file)
index 0000000..daa3860
--- /dev/null
+++ b/systemd/network/br0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=br0
+
+[Network]
+DNS=1.1.1.1 8.8.8.8 9.9.9.9

diff --git a/systemd/resolved.conf b/systemd/resolved.conf
index 9f70947d134b097aea368493312616fa07637ba3..39a4dabfa4cfc1c91677af1c2c2325196268efe6 100644 (file)
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -20,9 +20,11 @@
 # Google:     8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
 # Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
 #DNS=
-#FallbackDNS=
+FallbackDNS=1.1.1.1 8.8.8.8 9.9.9.9
 #Domains=
+Domains=home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de uhu-banane.net
 #DNSSEC=no
+DNSSEC=no
 #DNSOverTLS=no
 #MulticastDNS=no
 #LLMNR=no
@@ -32,3 +34,5 @@
 #DNSStubListenerExtra=
 #ReadEtcHosts=yes
 #ResolveUnicastSingleLabel=no
+
+# vim: filetype=dosini