From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 15 Nov 2016 10:04:04 +0000 (+0100)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=cca014e20cff3124111936da74cf8d451a46ac6b;p=config%2Fns1%2Fetc.git

committing changes in /etc after apt run

Package changes:
-certbot 0.8.1-2~bpo8+1
+certbot 0.9.3-1~bpo8+1
-letsencrypt 0.8.1-2~bpo8+1
+letsencrypt 0.9.3-1~bpo8+1
-libcurl3-gnutls 7.38.0-4+deb8u4
+libcurl3-gnutls 7.38.0-4+deb8u5
-libmysqlclient18 5.5.52-0+deb8u1
+libmysqlclient18 5.5.53-0+deb8u1
-mariadb-client 10.0.27-0+deb8u1
-mariadb-client-10.0 10.0.27-0+deb8u1
-mariadb-client-core-10.0 10.0.27-0+deb8u1
-mariadb-common 10.0.27-0+deb8u1
+mariadb-client 10.0.28-0+deb8u1
+mariadb-client-10.0 10.0.28-0+deb8u1
+mariadb-client-core-10.0 10.0.28-0+deb8u1
+mariadb-common 10.0.28-0+deb8u1
-mysql-common 5.5.52-0+deb8u1
+mysql-common 5.5.53-0+deb8u1
-python-acme 0.8.1-1~bpo8+1
+python-acme 0.9.3-1~bpo8+1
-python-certbot 0.8.1-2~bpo8+1
-python-certbot-apache 0.8.1-1~bpo8+1
+python-certbot 0.9.3-1~bpo8+1
+python-certbot-apache 0.9.3-1~bpo8+1
-salt-common 2016.3.3+ds-1
-salt-minion 2016.3.3+ds-1
+salt-common 2016.3.4+ds-1
+salt-minion 2016.3.4+ds-1
-tzdata 2016h-0+deb8u1
+tzdata 2016i-0+deb8u1
---

diff --git a/.etckeeper b/.etckeeper
index ab98fef..fa6db19 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1150,6 +1150,7 @@ maybe chmod 0755 'systemd/system/poweroff.target.wants'
 maybe chmod 0755 'systemd/system/reboot.target.wants'
 maybe chmod 0755 'systemd/system/sockets.target.wants'
 maybe chmod 0755 'systemd/system/sysinit.target.wants'
+maybe chmod 0755 'systemd/system/timers.target.wants'
 maybe chmod 0644 'systemd/timesyncd.conf'
 maybe chmod 0644 'systemd/user.conf'
 maybe chmod 0755 'terminfo'
diff --git a/cron.d/certbot b/cron.d/certbot
index aef16b2..dc2f28b 100644
--- a/cron.d/certbot
+++ b/cron.d/certbot
@@ -8,4 +8,4 @@
 SHELL=/bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-0 */12 * * * root test -x /usr/bin/certbot && perl -e 'sleep int(rand(3600))' && certbot -q renew
+0 */12 * * * root test -x /usr/bin/certbot -a \! -d /run/systemd/system && perl -e 'sleep int(rand(3600))' && certbot -q renew
diff --git a/salt/minion b/salt/minion
index 7270f0c..9bc9408 100644
--- a/salt/minion
+++ b/salt/minion
@@ -397,7 +397,17 @@
 # access the master has to the minion.
 #disable_modules: [cmd,test]
 #disable_returners: []
-#
+
+# This is the reverse of disable_modules.  The default, like disable_modules, is the empty list,
+# but if this option is set to *anything* then *only* those modules will load.
+# Note that this is a very large hammer and it can be quite difficult to keep the minion working
+# the way you think it should since Salt uses many modules internally itself.  At a bare minimum
+# you need the following enabled or else the minion won't start.
+#whitelist_modules:
+#  - cmdmod
+#  - test
+#  - config
+
 # Modules can be loaded from arbitrary paths. This enables the easy deployment
 # of third party modules. Modules for returners and minions can be loaded.
 # Specify a list of extra directories to search for minion modules and
diff --git a/systemd/system/timers.target.wants/certbot.timer b/systemd/system/timers.target.wants/certbot.timer
new file mode 120000
index 0000000..b8d4c22
--- /dev/null
+++ b/systemd/system/timers.target.wants/certbot.timer
@@ -0,0 +1 @@
+/lib/systemd/system/certbot.timer
\ No newline at end of file