daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 52e05465b1f90ee63cf601479e9ffd1c0a72856e..7ea8aecb7073b499b0eef02d120cc51c40b38942 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -586,6 +586,7 @@ maybe chmod 0755 'rdnssd'
 maybe chmod 0755 'rdnssd/merge-hook'
 maybe chmod 0644 'reportbug.conf'
 maybe chmod 0644 'resolv.conf'
+maybe chmod 0644 'resolv.conf.bak'
 maybe chmod 0644 'resolv.conf.dhcp'
 maybe chmod 0644 'resolv.conf.new'
 maybe chmod 0644 'resolvconf.conf'

diff --git a/resolv.conf b/resolv.conf
index 7347806234b61d61f32ea8fa6f73c970dc099365..1e9ac29d493d4f7ef3cc72eb0dfec19ea590e048 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1 +1,6 @@
-nameserver fd00::a96:d7ff:fe55:4821
+# Generated by resolvconf
+domain fritz.box
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de fritz.box
+nameserver 10.12.11.2
+nameserver 2a02:8109:9300:488:5604:a6ff:fe38:99f9
+nameserver 10.12.11.254

diff --git a/resolv.conf.bak b/resolv.conf.bak
new file mode 100644 (file)
index 0000000..7347806
--- /dev/null
+++ b/resolv.conf.bak
@@ -0,0 +1 @@
+nameserver fd00::a96:d7ff:fe55:4821

diff --git a/resolvconf.conf b/resolvconf.conf
index 1c0361650adb1d782dcb237352b8870123497f9f..7635865a9920137fafa8c777504bb300ca29ff36 100644 (file)
--- a/resolvconf.conf
+++ b/resolvconf.conf
@@ -4,7 +4,10 @@
 resolv_conf=/etc/resolv.conf
 # If you run a local name server, you should uncomment the below line and
 # configure your subscribers configuration files below.
-#name_servers=127.0.0.1
+name_servers=10.12.11.2
+
+search_domains="home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de"
+replace="nameserver/fd00::a96:d7ff:fe55:4821/2a02:8109:9300:488:5604:a6ff:fe38:99f9"
 
 # Mirror the Debian package defaults for the below resolvers
 # so that resolvconf integrates seemlessly.