saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 4a985c07234bdaca694a079f877b8bb72871e47f..e3cb9f32a7bf6bb3b72417a2d1e63b2271ed09a5 100755 (executable)
--- 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 2964781a0b4294bce76330dc2b757c673978e836..837f52876118ac24aee03037d7bd055141d3c434 100644 (file)
--- 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 (file)
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 607f6af4d91996057cc4c77dbbb91ce7e78ac441..568939bf831024e18fc00444debb6af2fb0f8afa 100644 (file)
--- 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 d6f0a573eba245443a43e364b6500f062c95f4f5..84776734aa0bb192e2162be36d82ee819dd20a74 100644 (file)
--- 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 01c00098a1e24bd2f06cdca5e4ba18a4704e6bec..3c923efae2ad978848d04bcfdb1d8d988d1abda7 100644 (file)
--- 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