saving uncommitted changes in /etc prior to apt run

diff --git a/.ackrc b/.ackrc
new file mode 100644 (file)
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 9beebd7206854c64850384ab9b57c2bc86a35406..df9268245ad32191325a77e3f52a1082fe299d74 100755 (executable)
--- 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 7c9776aad39b9618486c357d379841a8e0d8f181..48826b84a187bcaaf7c368a3ba5d884a94f02612 100644 (file)
--- 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 03b5546296d2d550a489eb506f45f4b4f3279d49..cb52adcce7c55688b6c227efbef96e14ec3cecda 100644 (file)
--- 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 (file)
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 0c7d6527288c7b3eb89e494f521fab7aaf757a64..9da6039013104b2f6419f4104a34315607d22109 100644 (file)
--- 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 219dcad228298259e92fb9b67202ffcb41aee908..630805e2d81064ba4c77167672e08c71bc887d4c 100644 (file)
--- 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