From 50b0d881aa6dbce32e41f509cb8caf0edc597a4f Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 20 Dec 2016 17:58:31 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 1 + resolv.conf | 8 +++++--- resolv.conf.bak | 3 +++ resolvconf.conf | 8 +++++++- ssmtp/ssmtp.conf | 4 +++- systemd/resolved.conf | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 resolv.conf.bak diff --git a/.etckeeper b/.etckeeper index 4a985c0..e3cb9f3 100755 --- a/.etckeeper +++ b/.etckeeper @@ -522,6 +522,7 @@ maybe chmod 0644 'profile.env' maybe chmod 0644 'protocols' maybe chmod 0644 'rc.conf' maybe chmod 0644 'resolv.conf' +maybe chmod 0644 'resolv.conf.bak' maybe chmod 0644 'resolvconf.conf' maybe chmod 0755 'revdep-rebuild' maybe chmod 0644 'revdep-rebuild/99revdep-rebuild' diff --git a/resolv.conf b/resolv.conf index 2964781..837f528 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,3 +1,5 @@ -# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8) -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -nameserver 192.168.122.1 +# Generated by resolvconf +search pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net +nameserver 217.66.52.10 +nameserver 212.91.225.75 +options single-request-reopen diff --git a/resolv.conf.bak b/resolv.conf.bak new file mode 100644 index 0000000..2964781 --- /dev/null +++ b/resolv.conf.bak @@ -0,0 +1,3 @@ +# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8) +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN +nameserver 192.168.122.1 diff --git a/resolvconf.conf b/resolvconf.conf index 607f6af..568939b 100644 --- a/resolvconf.conf +++ b/resolvconf.conf @@ -4,4 +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 \ No newline at end of file +#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/ssmtp/ssmtp.conf b/ssmtp/ssmtp.conf index d6f0a57..8477673 100644 --- a/ssmtp/ssmtp.conf +++ b/ssmtp/ssmtp.conf @@ -23,6 +23,7 @@ mailhub=mail02.pixelpark.com # Where will the mail seem to come from? #rewriteDomain= +rewriteDomain=pixelpark.com # The full hostname @@ -31,13 +32,14 @@ mailhub=mail02.pixelpark.com # out the hostname itself. # hostname=_HOSTNAME_ +hostname=berta.pixelpark.com # Set this to never rewrite the "From:" line (unless not given) and to # use that address in the "from line" of the envelope. #FromLineOverride=YES # Use SSL/TLS to send secure messages to server. -UseTLS=YES +#UseTLS=YES # Use SSL/TLS certificate to authenticate against smtp host. #UseTLSCert=YES diff --git a/systemd/resolved.conf b/systemd/resolved.conf index 01c0009..3c923ef 100644 --- a/systemd/resolved.conf +++ b/systemd/resolved.conf @@ -16,5 +16,5 @@ #FallbackDNS=8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844 #LLMNR=yes DNS=217.66.52.10 212.91.225.75 -Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net +#Domains=pixelpark.com brehm-online.com uhu-banane.de uhu-banane.net -- 2.39.5