From: Frank Brehm Date: Tue, 10 Oct 2017 19:54:53 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d9c855767b3aed8e19f3b3e0dfe55b81be8bb9ad;p=config%2Fns1%2Fetc.git committing changes in /etc after apt run Package changes: -apt 1.4.7 amd64 +apt 1.4.8 amd64 -apt-utils 1.4.7 amd64 +apt-utils 1.4.8 amd64 -base-files 9.9+deb9u1 amd64 +base-files 9.9+deb9u2 amd64 -chrony 3.0-4 amd64 +chrony 3.0-4+deb9u1 amd64 -dbus 1.10.18-1 amd64 +dbus 1.10.22-0+deb9u1 amd64 -dirmngr 2.1.18-6 amd64 +dirmngr 2.1.18-8~deb9u1 amd64 -git 1:2.11.0-3+deb9u1 amd64 -git-email 1:2.11.0-3+deb9u1 all -git-man 1:2.11.0-3+deb9u1 all -gnupg 2.1.18-6 amd64 -gnupg-agent 2.1.18-6 amd64 -gpgv 2.1.18-6 amd64 +git 1:2.11.0-3+deb9u2 amd64 +git-email 1:2.11.0-3+deb9u2 all +git-man 1:2.11.0-3+deb9u2 all +gnupg 2.1.18-8~deb9u1 amd64 +gnupg-agent 2.1.18-8~deb9u1 amd64 +gpgv 2.1.18-8~deb9u1 amd64 -haveged 1.9.1-5 amd64 +haveged 1.9.1-5+deb9u1 amd64 -icinga2 2.7.1-1.stretch amd64 -icinga2-bin 2.7.1-1.stretch amd64 -icinga2-classicui 2.7.1-1.stretch all -icinga2-common 2.7.1-1.stretch all +icinga2 2.7.1-2.stretch amd64 +icinga2-bin 2.7.1-2.stretch amd64 +icinga2-classicui 2.7.1-2.stretch all +icinga2-common 2.7.1-2.stretch all -krb5-locales 1.15-1 all +krb5-locales 1.15-1+deb9u1 all -libapt-inst2.0 1.4.7 amd64 -libapt-pkg5.0 1.4.7 amd64 +libapt-inst2.0 1.4.8 amd64 +libapt-pkg5.0 1.4.8 amd64 -libcurl3-gnutls 7.52.1-5 amd64 +libcurl3-gnutls 7.52.1-5+deb9u1 amd64 -libdb5.3 5.3.28-12+b1 amd64 +libdb5.3 5.3.28-12+deb9u1 amd64 -libdbus-1-3 1.10.18-1 amd64 +libdbus-1-3 1.10.22-0+deb9u1 amd64 -libgnutls-openssl27 3.5.8-5+deb9u2 amd64 -libgnutls30 3.5.8-5+deb9u2 amd64 +libgnutls-openssl27 3.5.8-5+deb9u3 amd64 +libgnutls30 3.5.8-5+deb9u3 amd64 -libgssapi-krb5-2 1.15-1 amd64 -libhavege1 1.9.1-5 amd64 -libhogweed4 3.3-1+b1 amd64 +libgssapi-krb5-2 1.15-1+deb9u1 amd64 +libhavege1 1.9.1-5+deb9u1 amd64 +libhogweed4 3.3-1+b2 amd64 -libicinga2 2.7.1-1.stretch amd64 +libicinga2 2.7.1-2.stretch amd64 -libidn2-0 0.16-1 amd64 +libidn2-0 0.16-1+deb9u1 amd64 -libk5crypto3 1.15-1 amd64 +libk5crypto3 1.15-1+deb9u1 amd64 -libkrb5-3 1.15-1 amd64 -libkrb5support0 1.15-1 amd64 +libkrb5-3 1.15-1+deb9u1 amd64 +libkrb5support0 1.15-1+deb9u1 amd64 -libldap-2.4-2 2.4.44+dfsg-5 amd64 -libldap-common 2.4.44+dfsg-5 all +libldap-2.4-2 2.4.44+dfsg-5+deb9u1 amd64 +libldap-common 2.4.44+dfsg-5+deb9u1 all -libncurses5 6.0+20161126-1 amd64 -libncursesw5 6.0+20161126-1 amd64 +libncurses5 6.0+20161126-1+deb9u1 amd64 +libncursesw5 6.0+20161126-1+deb9u1 amd64 -libnettle6 3.3-1+b1 amd64 +libnettle6 3.3-1+b2 amd64 -libselinux1 2.6-3+b1 amd64 +libselinux1 2.6-3+b3 amd64 -libtinfo5 6.0+20161126-1 amd64 +libtinfo5 6.0+20161126-1+deb9u1 amd64 -linux-image-amd64 4.9+80+deb9u1 amd64 +linux-image-4.9.0-4-amd64 4.9.51-1 amd64 +linux-image-amd64 4.9+80+deb9u2 amd64 -ncurses-base 6.0+20161126-1 all -ncurses-bin 6.0+20161126-1 amd64 -ncurses-term 6.0+20161126-1 all +ncurses-base 6.0+20161126-1+deb9u1 all +ncurses-bin 6.0+20161126-1+deb9u1 amd64 +ncurses-term 6.0+20161126-1+deb9u1 all -postfix 3.1.4-7 amd64 -postfix-pcre 3.1.4-7 amd64 -postfix-sqlite 3.1.4-7 amd64 +postfix 3.1.6-0+deb9u1 amd64 +postfix-pcre 3.1.6-0+deb9u1 amd64 +postfix-sqlite 3.1.6-0+deb9u1 amd64 -salt-common 2017.7.1+ds-1 all -salt-minion 2017.7.1+ds-1 all +salt-common 2017.7.2+ds-1 all +salt-minion 2017.7.2+ds-1 all -vim 2:8.0.0197-4 amd64 +vim 2:8.0.0197-4+deb9u1 amd64 -vim-common 2:8.0.0197-4 all -vim-icinga2 2.7.1-1.stretch all -vim-runtime 2:8.0.0197-4 all -vim-tiny 2:8.0.0197-4 amd64 +vim-common 2:8.0.0197-4+deb9u1 all +vim-icinga2 2.7.1-2.stretch all +vim-runtime 2:8.0.0197-4+deb9u1 all +vim-tiny 2:8.0.0197-4+deb9u1 amd64 -whois 5.2.15 amd64 +whois 5.2.17~deb9u1 amd64 -xkb-data 2.19-1 all +xkb-data 2.19-1+deb9u1 all -xxd 2:8.0.0197-4 amd64 +xxd 2:8.0.0197-4+deb9u1 amd64 --- diff --git a/.etckeeper b/.etckeeper index 26e2b2c..eb4c677 100755 --- 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 6a4126c..8962fa3 100644 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 2bafc87..cdbb8e6 100644 --- 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 28a2186..1a2c355 100644 --- 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 7c7e01e..b4de1fa 100755 --- 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 03b00e4..c4c09ae 100644 --- 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 ee25043..62698f5 100755 --- a/ppp/ip-up.d/chrony +++ b/ppp/ip-up.d/chrony @@ -6,6 +6,6 @@ # Modified by Vincent Blut /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 b1122c9..6cae043 100644 --- 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 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