From 8240be6a4a3a61a17f9ac4c6c2bb75140912d336 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 7 Apr 2021 22:06:05 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .ackrc | 2 ++ .etckeeper | 2 ++ bind/named.conf.local | 2 +- bind/zones.rfc1918 | 10 +++++++++ logrotate.d/bind | 33 ++++++++++++++++++++++++++++++ network/interfaces.d/50-cloud-init | 2 +- resolv.conf | 1 + 7 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .ackrc create mode 100644 logrotate.d/bind diff --git a/.ackrc b/.ackrc new file mode 100644 index 0000000..cf742b4 --- /dev/null +++ b/.ackrc @@ -0,0 +1,2 @@ +--type-set=puppet:ext:pp +--sort-files diff --git a/.etckeeper b/.etckeeper index 9beebd7..df92682 100755 --- a/.etckeeper +++ b/.etckeeper @@ -35,6 +35,7 @@ mkdir -p './systemd/user' mkdir -p './tmpfiles.d' mkdir -p './udev/hwdb.d' maybe chmod 0755 '.' +maybe chmod 0644 '.ackrc' maybe chmod 0700 '.etckeeper' maybe chmod 0600 '.gitignore' maybe chmod 0755 'NetworkManager' @@ -444,6 +445,7 @@ maybe chmod 0755 'logrotate.d' maybe chmod 0644 'logrotate.d/alternatives' maybe chmod 0644 'logrotate.d/apt' maybe chmod 0644 'logrotate.d/aptitude' +maybe chmod 0644 'logrotate.d/bind' maybe chmod 0644 'logrotate.d/btmp' maybe chmod 0644 'logrotate.d/dpkg' maybe chmod 0644 'logrotate.d/rsyslog' diff --git a/bind/named.conf.local b/bind/named.conf.local index 7c9776a..48826b8 100644 --- a/bind/named.conf.local +++ b/bind/named.conf.local @@ -11,6 +11,6 @@ // Consider adding the 1918 zones here, if they are not used in your // organization -include "/etc/bind/zones.rfc1918"; +// include "/etc/bind/zones.rfc1918"; // vim: ts=4 filetype=named noai diff --git a/bind/zones.rfc1918 b/bind/zones.rfc1918 index 03b5546..cb52adc 100644 --- a/bind/zones.rfc1918 +++ b/bind/zones.rfc1918 @@ -1,3 +1,11 @@ +//############################################################### +//# Bind9-Konfigurationsdatei Default zones RFC 1918 +//# /etc/bind/zones.rfc1918 +//# +//# Host helga.uhu-banane.de +//# +//############################################################### + zone "10.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; zone "16.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; @@ -18,3 +26,5 @@ zone "30.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; zone "31.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; + +# vim: ts=4 filetype=named noai diff --git a/logrotate.d/bind b/logrotate.d/bind new file mode 100644 index 0000000..8955664 --- /dev/null +++ b/logrotate.d/bind @@ -0,0 +1,33 @@ +/var/log/bind/complete-debug.log /var/log/bind/debug.log /var/log/bind/query.log /var/log/bind/security.log { + daily + olddir /var/log/bind/.old + dateext + size 4M + rotate 10 + notifempty + missingok + compress + delaycompress + sharedscripts + postrotate + /usr/sbin/rndc reload + endscript +} + +/var/log/bind/named.log { + daily + olddir /var/log/bind/.old + dateext + size 10M + rotate 20 + notifempty + missingok + compress + delaycompress + sharedscripts + postrotate + /usr/sbin/rndc reload + endscript +} + +# vim: ts=4 filetype=conf diff --git a/network/interfaces.d/50-cloud-init b/network/interfaces.d/50-cloud-init index 0c7d652..9da6039 100644 --- a/network/interfaces.d/50-cloud-init +++ b/network/interfaces.d/50-cloud-init @@ -8,7 +8,7 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp - dns-nameservers 213.133.98.98 213.133.99.99 213.133.100.100 + dns-nameservers 127.0.0.1 213.133.98.98 213.133.99.99 213.133.100.100 # control-alias eth0 iface eth0 inet6 static diff --git a/resolv.conf b/resolv.conf index 219dcad..630805e 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,5 +1,6 @@ domain uhu-banane.de search uhu-banane.de brehm-online.com brehm-berlin.de uhu-banane.net hennig-berlin.org +nameserver 127.0.0.1 nameserver 213.133.98.98 nameserver 213.133.99.99 nameserver 213.133.100.100 -- 2.39.5