saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 349b6677cc39b67a9016d09886f11ce91e7b65bf..ae49f36119ec87e337ebb4cae439c729e7a170c6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -56,6 +56,7 @@ maybe chmod 0755 'apt'
 maybe chmod 0644 'apt/SALTSTACK-GPG-KEY.pub'
 maybe chmod 0755 'apt/apt.conf.d'
 maybe chmod 0644 'apt/apt.conf.d/00CDMountPoint'
+maybe chmod 0644 'apt/apt.conf.d/00recommends'
 maybe chmod 0644 'apt/apt.conf.d/00trustcdrom'
 maybe chmod 0644 'apt/apt.conf.d/01autoremove'
 maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels'
@@ -65,6 +66,7 @@ maybe chmod 0644 'apt/apt.conf.d/70debconf'
 maybe chmod 0644 'apt/apt.conf.d/99force-ipv4'
 maybe chmod 0644 'apt/listchanges.conf'
 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 0755 'apt/sources.list.d'
@@ -572,6 +574,7 @@ maybe chmod 0755 'salt/pki'
 maybe chmod 0700 'salt/pki/minion'
 maybe chmod 0400 'salt/pki/minion/minion.pem'
 maybe chmod 0644 'salt/pki/minion/minion.pub'
+maybe chmod 0644 'salt/pki/minion/minion_master.pub'
 maybe chmod 0755 'sbuild'
 maybe chmod 0755 'sbuild/chroot'
 maybe chmod 0644 'sbuild/sbuild.conf'

diff --git a/apt/apt.conf.d/00recommends b/apt/apt.conf.d/00recommends
new file mode 100644 (file)
index 0000000..7fecedc
--- /dev/null
+++ b/apt/apt.conf.d/00recommends
@@ -0,0 +1,2 @@
+APT::Install-Recommends "false";
+Aptitude::Recommends-Important "false";

diff --git a/apt/repo.uhu-banane.de.gpg-key.pub b/apt/repo.uhu-banane.de.gpg-key.pub
new file mode 100644 (file)
index 0000000..02152c5
--- /dev/null
+++ b/apt/repo.uhu-banane.de.gpg-key.pub
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=1kpZ
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/apt/sources.list b/apt/sources.list
index d383f3f06964841e3095a2e6f20d039caf465753..4bc05b28bf69c8eb59d547cd117e27c498dad501 100644 (file)
--- a/apt/sources.list
+++ b/apt/sources.list
@@ -1,21 +1,19 @@
-# 
+#
 
 # deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
 
-#deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
+# deb  http://ftp-stud.hs-esslingen.de/debian  stretch         main
 
-deb    http://ftp2.de.debian.org/debian/               stretch         main non-free contrib
-deb-src        http://ftp2.de.debian.org/debian/               stretch         main non-free contrib
+# 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
 
-deb    http://security.debian.org/debian-security      stretch/updates main contrib non-free
-deb-src        http://security.debian.org/debian-security      stretch/updates 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://ftp2.de.debian.org/debian/               stretch-updates main contrib non-free
-deb-src        http://ftp2.de.debian.org/debian/               stretch-updates main contrib non-free
+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
-# Line commented out by installer because it failed to verify:
-#deb   http://ftp.de.debian.org/debian/                stretch-backports main contrib non-free
-# Line commented out by installer because it failed to verify:
-#deb-src       http://ftp2.de.debian.org/debian/               stretch-backports main contrib non-free
+# vim: noet ts=8

diff --git a/apt/sources.list.d/fbrehm.list b/apt/sources.list.d/fbrehm.list
index 5ca53ddaa23c27c9c21eaa6d746c430409d406c6..7e43b7596350ae90f610957403f1e4b902107746 100644 (file)
--- a/apt/sources.list.d/fbrehm.list
+++ b/apt/sources.list.d/fbrehm.list
@@ -2,5 +2,5 @@
 # ---------------------
 
 #deb   http://www.brehm-online.com/debian/stretch      ./
-deb    http://repo.uhu-banane.de/Debian/stretch        ./
+deb    http://repo.uhu-banane.de/Debian/stretch                ./
 deb-src        http://repo.uhu-banane.de/Sources               ./

diff --git a/logrotate.conf b/logrotate.conf
index b504c76f13a396cf6e25052c2136ceaca2218251..4eb82857866aa7c0310be0b67f5437c8649283cf 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -21,6 +21,8 @@ include /etc/logrotate.d
     monthly
     create 0664 root utmp
     rotate 12
+    dateext
+    dateformat -%Y-%m-%d
     size 4M
 }
 
@@ -29,6 +31,8 @@ include /etc/logrotate.d
     monthly
     create 0660 root utmp
     rotate 12
+    dateext
+    dateformat -%Y-%m-%d
     size 4M
 }
 

diff --git a/logrotate.d/apt b/logrotate.d/apt
index 0551563e3108213bcab76b061a52a243f795e317..d22ba7262d9f6b2c81599e3788226817a40f16c3 100644 (file)
--- a/logrotate.d/apt
+++ b/logrotate.d/apt
@@ -1,23 +1,25 @@
 /var/log/apt/term.log {
-       rotate 12
-       monthly
-       compress
-       delaycompress
-       missingok
-       notifempty
-       size 1M
-       dateext
+    rotate 12
+    monthly
+    compress
+    missingok
+    notifempty
+    size 1M
+    delaycompress
+    dateext
+    dateformat -%Y-%m-%d
 }
 
 /var/log/apt/history.log {
-       rotate 12
-       monthly
-       compress
-       delaycompress
-       missingok
-       notifempty
-       size 1M
-       dateext
+    rotate 12
+    monthly
+    compress
+    missingok
+    notifempty
+    size 1M
+    delaycompress
+    dateext
+    dateformat -%Y-%m-%d
 }
 
 # vim: ts=4 filetype=conf et

diff --git a/logrotate.d/aptitude b/logrotate.d/aptitude
index c2b3959a1e8bcb86ab36ba0f0269fa16f1b0c590..369f333470194581e1983b8cab440fa273ff4ea7 100644 (file)
--- a/logrotate.d/aptitude
+++ b/logrotate.d/aptitude
@@ -2,11 +2,12 @@
     rotate 6
     monthly
     compress
-    delaycompress
     missingok
     notifempty
     size 1M
+    delaycompress
     dateext
+    dateformat -%Y-%m-%d
     olddir /var/log/.old
 }
 

diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index 0b0c14435a037c10bbadc487f3e925c7bf21a077..ee0d3e41906da354e120d6e153183587aa7ea038 100644 (file)
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -1,24 +1,29 @@
 /var/log/dpkg.log {
-       monthly
-       rotate 12
-       compress
-       delaycompress
-       missingok
-       notifempty
-       size 1M
-       create 644 root root
-       dateext
-       olddir /var/log/.old
+    monthly
+    rotate 12
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    create 644 root root
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
 /var/log/alternatives.log {
-       monthly
-       rotate 12
-       compress
-       delaycompress
-       missingok
-       notifempty
-       size 1M
-       create 644 root root
-       dateext
-       olddir /var/log/.old
+    monthly
+    rotate 12
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    create 644 root root
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/salt/pki/minion/minion_master.pub b/salt/pki/minion/minion_master.pub
new file mode 100644 (file)
index 0000000..b677f0b
--- /dev/null
+++ b/salt/pki/minion/minion_master.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUbxQYMDoCPQTWHREbbu
+lTBJ+BNLjeUalhTgXjaR7uNiGryiOoLGtSiQFwiYClJ/7QqUoSG7A9c5Xw1Qv6CI
+H73sBAdniAFaC9jeY+4Pe22QlrIuE9AoWGNw9X2gDQ1/9MHGaFnlumDW5pLNvP+i
+nd3DRVNuhSR+S0/sTJUbFpzXXIzN0WijIBLA+oqlR/ANPc89Y+XhXUaVje48yW0l
+oEiedhRzHPGS5mGwyDs9MqLano1LeRdu4kdyhboljqX3c/SsVgc/Q3oD42+XerI1
+rz+mkLBNzHhNQWn6k6W8PdiYTnRXH6WUyMMxniBR/5QPWx3Owu5aeSy23Dhl6SRc
+EQIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file