]> Frank Brehm's Git Trees - config/berta/etc.git/commitdiff
saving uncommitted changes in /etc prior to emerge run
authorFrank Brehm <frank@brehm-online.com>
Wed, 22 Mar 2017 12:31:26 +0000 (13:31 +0100)
committerFrank Brehm <frank@brehm-online.com>
Wed, 22 Mar 2017 12:31:26 +0000 (13:31 +0100)
.etckeeper
config-archive/etc/resolvconf.conf [new file with mode: 0644]
config-archive/etc/resolvconf.conf.dist.new [new file with mode: 0644]

index d34bb1eb3220c6bb75eaabe0ec2bf1cdd6d7b54e..52ad78e9ff1c0ce6735ce976a0313eb61431b5b7 100755 (executable)
@@ -200,6 +200,8 @@ maybe chmod 0644 'config-archive/etc/logrotate.d/apache2'
 maybe chmod 0644 'config-archive/etc/logrotate.d/apache2.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog'
 maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new'
+maybe chmod 0644 'config-archive/etc/resolvconf.conf'
+maybe chmod 0644 'config-archive/etc/resolvconf.conf.dist.new'
 maybe chmod 0644 'config-archive/etc/rsyslog.conf'
 maybe chmod 0644 'config-archive/etc/rsyslog.conf.dist.new'
 maybe chmod 0755 'config-archive/etc/rsyslog.d'
diff --git a/config-archive/etc/resolvconf.conf b/config-archive/etc/resolvconf.conf
new file mode 100644 (file)
index 0000000..568939b
--- /dev/null
@@ -0,0 +1,13 @@
+# Configuration for resolvconf(8)
+# See resolvconf.conf(5) for details
+
+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="217.66.52.10 212.91.225.75"
+
+search_domains="pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net"
+
+resolv_conf_options="single-request-reopen"
+
diff --git a/config-archive/etc/resolvconf.conf.dist.new b/config-archive/etc/resolvconf.conf.dist.new
new file mode 100644 (file)
index 0000000..607f6af
--- /dev/null
@@ -0,0 +1,7 @@
+# Configuration for resolvconf(8)
+# See resolvconf.conf(5) for details
+
+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
\ No newline at end of file