saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 113e062def1cdf209640906047541536cfaaa5d6..1f977b11baff8028b2dcc6417e56422cb6df5118 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -107,9 +107,15 @@ maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key.pub'
 maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub'
 maybe chmod 0644 'apt/sources.list'
+maybe chmod 0644 'apt/sources.list.bak'
 maybe chmod 0755 'apt/sources.list.d'
 maybe chmod 0644 'apt/sources.list.d/fbrehm.list'
+maybe chmod 0644 'apt/sources.list.d/fbrehm.list.bak'
+maybe chmod 0644 'apt/sources.list.d/fbrehm.list.new'
 maybe chmod 0644 'apt/sources.list.d/salt.list'
+maybe chmod 0644 'apt/sources.list.d/salt.list.bak'
+maybe chmod 0644 'apt/sources.list.d/salt.list.new'
+maybe chmod 0644 'apt/sources.list.new'
 maybe chmod 0644 'apt/trusted.gpg'
 maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-automatic.gpg'
@@ -735,6 +741,7 @@ maybe chmod 0755 'logwatch/conf'
 maybe chmod 0755 'logwatch/conf/logfiles'
 maybe chmod 0644 'logwatch/conf/logfiles/cron.conf'
 maybe chmod 0644 'logwatch/conf/logfiles/daemon.conf'
+maybe chmod 0644 'logwatch/conf/logfiles/dovecot.conf'
 maybe chmod 0644 'logwatch/conf/logfiles/fail2ban.conf'
 maybe chmod 0644 'logwatch/conf/logfiles/iptables.conf'
 maybe chmod 0644 'logwatch/conf/logfiles/maillog.conf'

diff --git a/apt/sources.list.bak b/apt/sources.list.bak
new file mode 100644 (file)
index 0000000..764a998
--- /dev/null
+++ b/apt/sources.list.bak
@@ -0,0 +1,19 @@
+# deb  http://ftp-stud.hs-esslingen.de/debian  jessie          main
+
+# main jessie repositories
+deb    http://ftp-stud.hs-esslingen.de/debian  jessie          main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  jessie          main contrib non-free
+
+# jessie security updates
+deb    http://security.debian.org/     jessie/updates  main contrib non-free
+deb-src        http://security.debian.org/     jessie/updates  main contrib non-free
+
+# jessie-updates, previously known as 'volatile'
+deb    http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  jessie-updates  main contrib non-free
+
+# jessie-backports, previously on backports.debian.org
+deb    http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian/ jessie-backports        main contrib non-free
+
+# vim: noet ts=8

diff --git a/apt/sources.list.d/fbrehm.list.bak b/apt/sources.list.d/fbrehm.list.bak
new file mode 100644 (file)
index 0000000..d773712
--- /dev/null
+++ b/apt/sources.list.d/fbrehm.list.bak
@@ -0,0 +1,6 @@
+# Packages Frank Brehm
+# ---------------------
+
+#deb   http://www.brehm-online.com/debian/jessie       ./
+deb    http://repo.uhu-banane.de/Debian/jessie         ./
+deb-src        http://repo.uhu-banane.de/Sources               ./

diff --git a/apt/sources.list.d/fbrehm.list.new b/apt/sources.list.d/fbrehm.list.new
new file mode 100644 (file)
index 0000000..7e43b75
--- /dev/null
+++ b/apt/sources.list.d/fbrehm.list.new
@@ -0,0 +1,6 @@
+# Packages Frank Brehm
+# ---------------------
+
+#deb   http://www.brehm-online.com/debian/stretch      ./
+deb    http://repo.uhu-banane.de/Debian/stretch                ./
+deb-src        http://repo.uhu-banane.de/Sources               ./

diff --git a/apt/sources.list.d/salt.list.bak b/apt/sources.list.d/salt.list.bak
new file mode 100644 (file)
index 0000000..846108d
--- /dev/null
+++ b/apt/sources.list.d/salt.list.bak
@@ -0,0 +1 @@
+deb    http://repo.saltstack.com/apt/debian/8/amd64/latest     jessie main

diff --git a/apt/sources.list.d/salt.list.new b/apt/sources.list.d/salt.list.new
new file mode 100644 (file)
index 0000000..9383dc2
--- /dev/null
+++ b/apt/sources.list.d/salt.list.new
@@ -0,0 +1 @@
+deb    http://repo.saltstack.com/apt/debian/9/amd64/latest     stretch main

diff --git a/apt/sources.list.new b/apt/sources.list.new
new file mode 100644 (file)
index 0000000..88838d9
--- /dev/null
+++ b/apt/sources.list.new
@@ -0,0 +1,19 @@
+# deb  http://ftp-stud.hs-esslingen.de/debian  stretch         main
+
+# main stretch repositories
+deb    http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch         main contrib non-free
+
+# stretch security updates
+deb    http://security.debian.org/     stretch/updates main contrib non-free
+deb-src        http://security.debian.org/     stretch/updates main contrib non-free
+
+# stretch-updates, previously known as 'volatile'
+deb    http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian  stretch-updates main contrib non-free
+
+# stretch-backports, previously on backports.debian.org
+deb    http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
+deb-src        http://ftp-stud.hs-esslingen.de/debian/ stretch-backports       main contrib non-free
+
+# vim: noet ts=8

diff --git a/logwatch/conf/logfiles/dovecot.conf b/logwatch/conf/logfiles/dovecot.conf
new file mode 100644 (file)
index 0000000..226630f
--- /dev/null
+++ b/logwatch/conf/logfiles/dovecot.conf
@@ -0,0 +1,6 @@
+LogFile = dovecot.log
+Archive = dovecot.log.*
+Archive = dovecot.log-*
+Archive = .old/dovecot.log.*
+Archive = .old/dovecot.log-*
+*ApplyStdDate = "%b %d %H:%M:%S "