From: Frank Brehm Date: Wed, 22 Mar 2017 12:31:26 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=e1a1243a8e8e7f77172e524b05c927c7b2b0f2ee;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index d34bb1e..52ad78e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -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 index 0000000..568939b --- /dev/null +++ b/config-archive/etc/resolvconf.conf @@ -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 index 0000000..607f6af --- /dev/null +++ b/config-archive/etc/resolvconf.conf.dist.new @@ -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