committing changes in /etc after apt run

author Frank Brehm <frank@brehm-online.com>

Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)

committer Frank Brehm <frank@brehm-online.com>

Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)
author Frank Brehm <frank@brehm-online.com>
Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)
committer Frank Brehm <frank@brehm-online.com>
Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)
diff --git a/.etckeeper b/.etckeeper

index 26e2b2cdd78271a073852fa3a390741725434304..eb4c6774c2a620c6fcb09e923f4eee7308ab3ae7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1526,6 +1526,8 @@ maybe chmod 0755 'systemd/system'
  maybe chmod 0644 'systemd/system.conf'
  maybe chmod 0755 'systemd/system/default.target.wants'
  maybe chmod 0755 'systemd/system/getty.target.wants'
+maybe chmod 0755 'systemd/system/icinga2.service.d'
+maybe chmod 0644 'systemd/system/icinga2.service.d/limits.conf'
  maybe chmod 0755 'systemd/system/multi-user.target.wants'
  maybe chmod 0755 'systemd/system/network-online.target.wants'
  maybe chmod 0755 'systemd/system/paths.target.wants'
diff --git a/aliases.db b/aliases.db

index 6a4126c56392989dba0aee30aa5c3a16649ffdcb..8962fa3c81a93d47e6d6ac2920f8d8925a1ce227 100644 (file)

Binary files a/aliases.db and b/aliases.db differ
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels

index 2bafc87195676371ca16c8b39d7f55170eaf99a3..cdbb8e6d639f3d3ec299b33c0ca87ca3f4e62783 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -2,16 +2,27 @@
  APT::NeverAutoRemove
  {
     "^linux-image-4\.9\.0-3-amd64$";
+   "^linux-image-4\.9\.0-4-amd64$";
     "^linux-headers-4\.9\.0-3-amd64$";
+   "^linux-headers-4\.9\.0-4-amd64$";
     "^linux-image-extra-4\.9\.0-3-amd64$";
+   "^linux-image-extra-4\.9\.0-4-amd64$";
     "^linux-signed-image-4\.9\.0-3-amd64$";
+   "^linux-signed-image-4\.9\.0-4-amd64$";
     "^kfreebsd-image-4\.9\.0-3-amd64$";
+   "^kfreebsd-image-4\.9\.0-4-amd64$";
     "^kfreebsd-headers-4\.9\.0-3-amd64$";
+   "^kfreebsd-headers-4\.9\.0-4-amd64$";
     "^gnumach-image-4\.9\.0-3-amd64$";
+   "^gnumach-image-4\.9\.0-4-amd64$";
     "^.*-modules-4\.9\.0-3-amd64$";
+   "^.*-modules-4\.9\.0-4-amd64$";
     "^.*-kernel-4\.9\.0-3-amd64$";
+   "^.*-kernel-4\.9\.0-4-amd64$";
     "^linux-backports-modules-.*-4\.9\.0-3-amd64$";
+   "^linux-backports-modules-.*-4\.9\.0-4-amd64$";
     "^linux-tools-4\.9\.0-3-amd64$";
+   "^linux-tools-4\.9\.0-4-amd64$";
  };
  /* Debug information:
  # dpkg list:
@@ -19,18 +30,23 @@ rc  linux-image-3.16.0-4-amd64           3.16.7-ckt25-2                 amd64
  rc  linux-image-4.7.0-0.bpo.1-amd64      4.7.8-1~bpo8+1                 amd64        Linux 4.7 for 64-bit PCs (signed)
  rc  linux-image-4.8.0-0.bpo.2-amd64      4.8.15-2~bpo8+2                amd64        Linux 4.8 for 64-bit PCs (signed)
  rc  linux-image-4.9.0-0.bpo.1-amd64      4.9.2-2~bpo8+1                 amd64        Linux 4.9 for 64-bit PCs (signed)
-iF  linux-image-4.9.0-3-amd64            4.9.30-2+deb9u5                amd64        Linux 4.9 for 64-bit PCs
-ii  linux-image-amd64                    4.9+80+deb9u1                  amd64        Linux for 64-bit PCs (meta-package)
+ii  linux-image-4.9.0-3-amd64            4.9.30-2+deb9u5                amd64        Linux 4.9 for 64-bit PCs
+iF  linux-image-4.9.0-4-amd64            4.9.51-1                       amd64        Linux 4.9 for 64-bit PCs
+iU  linux-image-amd64                    4.9+80+deb9u2                  amd64        Linux for 64-bit PCs (meta-package)
  # list of installed kernel packages:
  4.9.0-3-amd64 4.9.30-2+deb9u5
+4.9.0-4-amd64 4.9.51-1
  # list of different kernel versions:
+4.9.51-1
  4.9.30-2+deb9u5
-# Installing kernel: 4.9.30-2+deb9u5 (4.9.0-3-amd64)
+# Installing kernel: 4.9.51-1 (4.9.0-4-amd64)
  # Running kernel: 4.9.30-2+deb9u5 (4.9.0-3-amd64)
-# Last kernel: 4.9.30-2+deb9u5
-# Previous kernel: 
+# Last kernel: 4.9.51-1
+# Previous kernel: 4.9.30-2+deb9u5
  # Kernel versions list to keep:
  4.9.30-2+deb9u5
+4.9.51-1
  # Kernel packages (version part) to protect:
  4\.9\.0-3-amd64
+4\.9\.0-4-amd64
  */
diff --git a/debian_version b/debian_version

index 28a2186428bce031c24134633c4ab80a86f11668..1a2c3557ba4eb1138289c1a848eec2acccf85f9f 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-9.1
+9.2
diff --git a/network/if-up.d/chrony b/network/if-up.d/chrony

index 7c7e01e8381c056b6c8943a306052aec2a8817cb..b4de1fa7f7f5f7e606e630c30cdfde0774b303ae 100755 (executable)
--- a/network/if-up.d/chrony
+++ b/network/if-up.d/chrony
@@ -6,7 +6,7 @@ set -e
  
  if [ -e /run/chronyd.pid ] &&
      ip r list dev $IFACE 2> /dev/null | grep -q '^default'; then
-    chronyc -m online 'burst 4/10' > /dev/null 2>&1
+    chronyc online > /dev/null 2>&1
  else
      exit 0
  fi
diff --git a/postfix/makedefs.out b/postfix/makedefs.out

index 03b00e4e0858e7fabe26d00caec4d72480e683b4..c4c09aedc8b7d6c3c291358a97df977701678a3e 100644 (file)
--- a/postfix/makedefs.out
+++ b/postfix/makedefs.out
@@ -2,7 +2,7 @@
  #----------------------------------------------------------------
  # Start of summary of user-configurable 'make makefiles' options.
  # CCARGS=-DDEBIAN -DHAS_PCRE -DHAS_LDAP -DUSE_LDAP_SASL -DHAS_SQLITE -DMYORIGIN_FROM_FILE  -DHAS_CDB -DHAS_LMDB -DHAS_MYSQL -I/usr/include/mysql -DHAS_PGSQL -I/usr/include/postgresql -DHAS_SQLITE -I/usr/include -DHAS_SSL -I/usr/include/openssl -DUSE_SASL_AUTH -I/usr/include/sasl -DUSE_CYRUS_SASL -DUSE_TLS
-# AUXLIBS=-lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.4/debian
+# AUXLIBS=-lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.6/debian
  # AUXLIBS_CDB=-lcdb -L../../lib -L. -lpostfix-util
  # AUXLIBS_LMDB=-llmdb -L../../lib -L. -lpostfix-util
  # AUXLIBS_MYSQL=-lmysqlclient -L../../lib -L. -lpostfix-util -lpostfix-global
@@ -24,7 +24,7 @@ SYSTYPE       = LINUX3
  _AR    = ar
  ARFL   = rv
  _RANLIB        = ranlib
-SYSLIBS        = -pie -z relro -z now -lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.4/debian -ldb -lnsl -lresolv -ldl -L/usr/lib/x86_64-linux-gnu -licui18n -licuuc -licudata 
+SYSLIBS        = -pie -z relro -z now -lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.6/debian -ldb -lnsl -lresolv -ldl -L/usr/lib/x86_64-linux-gnu -licui18n -licuuc -licudata 
  AUXLIBS_CDB = -lcdb -L../../lib -L. -lpostfix-util
  AUXLIBS_LDAP = -lldap -llber -L../../lib -L. -lpostfix-util -lpostfix-global
  AUXLIBS_LMDB = -llmdb -L../../lib -L. -lpostfix-util
@@ -50,9 +50,9 @@ LIB_PREFIX = postfix-
  LIB_SUFFIX = .so
  SHLIB_CFLAGS = -fPIC
  SHLIB_DIR = /usr/lib/postfix
-SHLIB_ENV = LD_LIBRARY_PATH=/tmp/buildd/postfix-3.1.4/lib
+SHLIB_ENV = LD_LIBRARY_PATH=/tmp/buildd/postfix-3.1.6/lib
  SHLIB_LD = gcc -shared -Wl,-soname,${LIB}
-SHLIB_SYSLIBS = -lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.4/debian -ldb -lnsl -lresolv -ldl -L/usr/lib/x86_64-linux-gnu -licui18n -licuuc -licudata
+SHLIB_SYSLIBS = -lssl -lcrypto -lsasl2 -lpthread -L/tmp/buildd/postfix-3.1.6/debian -ldb -lnsl -lresolv -ldl -L/usr/lib/x86_64-linux-gnu -licui18n -licuuc -licudata
  SHLIB_RPATH = -Wl,--enable-new-dtags -Wl,-rpath,${SHLIB_DIR}
  # Switch between dynamicmaps.cf plugins and hard-linked databases.
  NON_PLUGIN_MAP_OBJ = 
diff --git a/ppp/ip-up.d/chrony b/ppp/ip-up.d/chrony

index ee25043246f66828e68545c96167d8f63905f8d9..62698f5a003b38307eca944fea98b2ecc72be7af 100755 (executable)
--- a/ppp/ip-up.d/chrony
+++ b/ppp/ip-up.d/chrony
@@ -6,6 +6,6 @@
  # Modified by Vincent Blut <vincent.debian@free.fr>
  
  /bin/pidof chronyd > /dev/null || exit 0
-/usr/bin/chronyc -m online 'burst 4/4' > /dev/null 2>&1
+/usr/bin/chronyc online > /dev/null 2>&1
  touch /var/run/chrony-ppp-up
  exit 0
diff --git a/salt/minion b/salt/minion

index b1122c9e5227f6408ec48aeb8319bb7e0465c0ca..6cae0432950411d6e18764cb8d39365297a26ec4 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -620,6 +620,9 @@
  # you do so at your own risk!
  #open_mode: False
  
+# The size of key that should be generated when creating new keys.
+#keysize: 2048
+
  # Enable permissive access to the salt keys.  This allows you to run the
  # master or minion as root, but have a non-root group be given access to
  # your pki_dir.  To make the access explicit, root must belong to the group
@@ -661,6 +664,21 @@
  #    ssl_version: PROTOCOL_TLSv1_2
  
  
+######        Reactor Settings        #####
+###########################################
+# Define a salt reactor. See https://docs.saltstack.com/en/latest/topics/reactor/
+#reactor: []
+
+#Set the TTL for the cache of the reactor configuration.
+#reactor_refresh_interval: 60
+
+#Configure the number of workers for the runner/wheel in the reactor.
+#reactor_worker_threads: 10
+
+#Define the queue size for workers in the reactor.
+#reactor_worker_hwm: 10000
+
+
  ######         Thread settings        #####
  ###########################################
  # Disable multiprocessing support, by default when a minion receives a
diff --git a/systemd/system/icinga2.service.d/limits.conf b/systemd/system/icinga2.service.d/limits.conf

new file mode 100644 (file)

index 0000000..ad24f7e
--- /dev/null
+++ b/systemd/system/icinga2.service.d/limits.conf
@@ -0,0 +1,9 @@
+# Icinga 2 sets some default values to extend OS defaults
+#
+# Please refer to our troubleshooting documentations for details
+# and reasons on these values.
+[Service]
+TasksMax=infinity
+
+# May also cause problems, uncomment if you have any
+#LimitNPROC=62883
author	Frank Brehm <frank@brehm-online.com>
	Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)
committer	Frank Brehm <frank@brehm-online.com>
	Tue, 10 Oct 2017 19:54:53 +0000 (21:54 +0200)
.etckeeper		patch \| blob \| history
aliases.db		patch \| blob \| history
apt/apt.conf.d/01autoremove-kernels		patch \| blob \| history
debian_version		patch \| blob \| history
network/if-up.d/chrony		patch \| blob \| history
postfix/makedefs.out		patch \| blob \| history
ppp/ip-up.d/chrony		patch \| blob \| history
salt/minion		patch \| blob \| history
systemd/system/icinga2.service.d/limits.conf	[new file with mode: 0644]	patch \| blob