From 711678622744b60a2dff60c194cd8d1b129e86d0 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 30 Nov 2020 20:17:27 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 logrotate.conf   | 15 ++++++++++++---
 logrotate.d/btmp |  8 ++++++--
 logrotate.d/wtmp | 11 +++++++----
 resolv.conf      |  9 +++++----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/logrotate.conf b/logrotate.conf
index 19eefe1..02e2ecb 100644
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -7,16 +7,25 @@ weekly
 su root adm
 
 # keep 4 weeks worth of backlogs
-rotate 4
+rotate 10
+maxage 731
 
 # create new (empty) log files after rotating old ones
 create
 
 # use date as a suffix of the rotated file
-#dateext
+dateext
+dateformat -%Y-%m-%d
+
+# do not rotate, if the file is empty
+notifempty
 
 # uncomment this if you want your log files compressed
-#compress
+compress
+delaycompress
+
+# is it okay, if a logfile doesn't exists ?
+missingok
 
 # packages drop log rotation information into this directory
 include /etc/logrotate.d
diff --git a/logrotate.d/btmp b/logrotate.d/btmp
index 0aa1ae1..2e5f092 100644
--- a/logrotate.d/btmp
+++ b/logrotate.d/btmp
@@ -1,7 +1,11 @@
 # no packages own btmp -- we'll rotate it here
 /var/log/btmp {
     missingok
-    monthly
+    weekly
     create 0660 root utmp
-    rotate 1
+    minsize 4M
+    rotate 12
+    dateext
+    dateformat -%Y-%m-%d
 }
+
diff --git a/logrotate.d/wtmp b/logrotate.d/wtmp
index cc8a151..bf86f23 100644
--- a/logrotate.d/wtmp
+++ b/logrotate.d/wtmp
@@ -1,8 +1,11 @@
-# no packages own wtmp -- we'll rotate it here
+# no packages own wtmp, or btmp -- we'll rotate them here
 /var/log/wtmp {
     missingok
-    monthly
+    weekly
     create 0664 root utmp
-    minsize 1M
-    rotate 1
+    rotate 12
+    minsize 4M
+    dateext
+    dateformat -%Y-%m-%d
 }
+
diff --git a/resolv.conf b/resolv.conf
index 9a0c1ae..c3eb8f0 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,6 @@
-search pixelpark.net pixelpark.com pixelpark.de brehm-online.com uhu-banane.net pp-dns.com
-nameserver 77.74.232.24
-nameserver 77.74.232.25
-nameserver 93.188.104.82
+search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de uhu-banane.net
+nameserver 127.0.0.1
+nameserver 1.1.1.1
+nameserver 8.8.8.8
+nameserver 8.8.4.4
 options timeout:1 attempts:2 use-vc
-- 
2.39.5