From b4ddb2c6712af66f15e5765377bdd48db7fcb936 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 10 Oct 2017 22:25:40 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -apache2 2.4.25-3+deb9u2 amd64 -apache2-bin 2.4.25-3+deb9u2 amd64 -apache2-data 2.4.25-3+deb9u2 all -apache2-utils 2.4.25-3+deb9u2 amd64 -apt 1.4.7 amd64 +apache2 2.4.25-3+deb9u3 amd64 +apache2-bin 2.4.25-3+deb9u3 amd64 +apache2-data 2.4.25-3+deb9u3 all +apache2-utils 2.4.25-3+deb9u3 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 -gitweb 1:2.11.0-3+deb9u1 all -gnupg 2.1.18-6 amd64 -gnupg-agent 2.1.18-6 amd64 -gnutls-bin 3.5.8-5+deb9u2 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 +gitweb 1:2.11.0-3+deb9u2 all +gnupg 2.1.18-8~deb9u1 amd64 +gnupg-agent 2.1.18-8~deb9u1 amd64 +gnutls-bin 3.5.8-5+deb9u3 amd64 +gpgv 2.1.18-8~deb9u1 amd64 -haveged 1.9.1-5 amd64 +haveged 1.9.1-5+deb9u1 amd64 -krb5-locales 1.15-1 all +krb5-locales 1.15-1+deb9u1 all -ldap-utils 2.4.44+dfsg-5 amd64 +ldap-utils 2.4.44+dfsg-5+deb9u1 amd64 -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 -libdbus-1-3 1.10.18-1 amd64 +libdb5.3 5.3.28-12+deb9u1 amd64 +libdbus-1-3 1.10.22-0+deb9u1 amd64 -libgnutls-dane0 3.5.8-5+deb9u2 amd64 -libgnutls-openssl27 3.5.8-5+deb9u2 amd64 -libgnutls30 3.5.8-5+deb9u2 amd64 +libgnutls-dane0 3.5.8-5+deb9u3 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 -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 -libperl5.24 5.24.1-3+deb9u1 amd64 +libperl5.24 5.24.1-3+deb9u2 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-4.9.0-3-amd64 4.9.30-2+deb9u3 amd64 -linux-image-amd64 4.9+80+deb9u1 amd64 +linux-image-4.9.0-3-amd64 4.9.30-2+deb9u5 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 -perl 5.24.1-3+deb9u1 amd64 -perl-base 5.24.1-3+deb9u1 amd64 -perl-doc 5.24.1-3+deb9u1 all +perl 5.24.1-3+deb9u2 amd64 +perl-base 5.24.1-3+deb9u2 amd64 +perl-doc 5.24.1-3+deb9u2 all -perl-modules-5.24 5.24.1-3+deb9u1 all +perl-modules-5.24 5.24.1-3+deb9u2 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-master 2017.7.1+ds-1 all -salt-minion 2017.7.1+ds-1 all -salt-ssh 2017.7.1+ds-1 all +salt-common 2017.7.2+ds-1 all +salt-master 2017.7.2+ds-1 all +salt-minion 2017.7.2+ds-1 all +salt-ssh 2017.7.2+ds-1 all -slapd 2.4.44+dfsg-5 amd64 +slapd 2.4.44+dfsg-5+deb9u1 amd64 -vim 2:8.0.0197-4 amd64 -vim-common 2:8.0.0197-4 all -vim-runtime 2:8.0.0197-4 all -vim-tiny 2:8.0.0197-4 amd64 +vim 2:8.0.0197-4+deb9u1 amd64 +vim-common 2:8.0.0197-4+deb9u1 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 --- aliases.db | Bin 12288 -> 12288 bytes apt/apt.conf.d/01autoremove-kernels | 34 ++++++++++++++++++++-------- debian_version | 2 +- network/if-up.d/chrony | 2 +- postfix/makedefs.out | 8 +++---- ppp/ip-up.d/chrony | 2 +- salt/master | 27 ++++++++++++++++++---- salt/minion | 18 +++++++++++++++ 8 files changed, 72 insertions(+), 21 deletions(-) diff --git a/aliases.db b/aliases.db index 9c50ba22150be4719e80928f4805a7477d8b309d..3f62c9b81a0435a04cee18f289e1eb59cf45e41b 100644 GIT binary patch delta 34 qcmZojXh@h~!#20Jy@~zh /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/master b/salt/master index e0711d0..abfc1fa 100644 --- a/salt/master +++ b/salt/master @@ -59,15 +59,14 @@ # Directory for custom modules. This directory can contain subdirectories for # each of Salt's module types such as "runners", "output", "wheel", "modules", -# "states", "returners", etc. -#extension_modules: +# "states", "returners", "engines", "utils", etc. +#extension_modules: /var/cache/salt/master/extmods # Directory for custom modules. This directory can contain subdirectories for # each of Salt's module types such as "runners", "output", "wheel", "modules", -# "states", "returners", "engines", etc. +# "states", "returners", "engines", "utils", etc. # Like 'extension_modules' but can take an array of paths -#module_dirs: -# - /var/cache/salt/minion/extmods +#module_dirs: [] # Verify and set permissions on configuration directories at startup: #verify_env: True @@ -302,6 +301,9 @@ # public keys from the minions. Note that this is insecure. #auto_accept: False +# The size of key that should be generated when creating new keys. +#keysize: 2048 + # Time in minutes that an incoming public key with a matching name found in # pki_dir/minion_autosign/keyid is automatically accepted. Expired autosign keys # are removed when the master checks the minion_autosign directory. @@ -959,6 +961,21 @@ #pillar_cache_backend: disk +###### 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 + + ##### Syndic settings ##### ########################################## # The Salt syndic is used to pass commands through a master from a higher 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 -- 2.39.5