From 66c046eca2cf3e5211bbcc740841dd106d315bb1 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 3 May 2018 15:30:36 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -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 +apache2 2.4.25-3+deb9u4 amd64 +apache2-bin 2.4.25-3+deb9u4 amd64 +apache2-data 2.4.25-3+deb9u4 all +apache2-utils 2.4.25-3+deb9u4 amd64 -curl 7.52.1-5+deb9u4 amd64 +curl 7.52.1-5+deb9u5 amd64 -icinga2 2.8.1-1.stretch amd64 -icinga2-bin 2.8.1-1.stretch amd64 -icinga2-classicui 2.8.1-1.stretch all -icinga2-common 2.8.1-1.stretch all +icinga2 2.8.4-1.stretch amd64 +icinga2-bin 2.8.4-1.stretch amd64 +icinga2-classicui 2.8.4-1.stretch all +icinga2-common 2.8.4-1.stretch all -libcurl3 7.52.1-5+deb9u4 amd64 -libcurl3-gnutls 7.52.1-5+deb9u4 amd64 +libcurl3 7.52.1-5+deb9u5 amd64 +libcurl3-gnutls 7.52.1-5+deb9u5 amd64 -libicinga2 2.8.1-1.stretch amd64 -libicu57 57.1-6+deb9u1 amd64 +libicinga2 2.8.4-1.stretch amd64 +libicu57 57.1-6+deb9u2 amd64 -libpam-systemd 232-25+deb9u2 amd64 +libpam-systemd 232-25+deb9u3 amd64 -libperl5.24 5.24.1-3+deb9u2 amd64 +libperl5.24 5.24.1-3+deb9u3 amd64 -libssl1.0.2 1.0.2l-2+deb9u2 amd64 -libssl1.1 1.1.0f-3+deb9u1 amd64 +libssl1.0.2 1.0.2l-2+deb9u3 amd64 +libssl1.1 1.1.0f-3+deb9u2 amd64 -libsystemd0 232-25+deb9u2 amd64 +libsystemd0 232-25+deb9u3 amd64 -libudev1 232-25+deb9u2 amd64 +libudev1 232-25+deb9u3 amd64 -linux-image-4.9.0-6-amd64 4.9.82-1+deb9u3 amd64 +linux-image-4.9.0-6-amd64 4.9.88-1 amd64 -openssl 1.1.0f-3+deb9u1 amd64 +openssl 1.1.0f-3+deb9u2 amd64 -perl 5.24.1-3+deb9u2 amd64 -perl-base 5.24.1-3+deb9u2 amd64 +perl 5.24.1-3+deb9u3 amd64 +perl-base 5.24.1-3+deb9u3 amd64 -perl-modules-5.24 5.24.1-3+deb9u2 all +perl-modules-5.24 5.24.1-3+deb9u3 all -salt-common 2017.7.4+ds-1 all -salt-minion 2017.7.4+ds-1 all +salt-common 2018.3.0+ds-1 all +salt-minion 2018.3.0+ds-1 all -systemd 232-25+deb9u2 amd64 +systemd 232-25+deb9u3 amd64 -tzdata 2018c-0+deb9u1 all +tzdata 2018d-0+deb9u1 all -udev 232-25+deb9u2 amd64 +udev 232-25+deb9u3 amd64 -vim-icinga2 2.8.1-1.stretch all +vim-icinga2 2.8.4-1.stretch all --- apt/apt.conf.d/01autoremove-kernels | 22 +++++++--------------- init.d/icinga2 | 16 +++++++++------- salt/minion | 21 ++++++++++++++++++--- salt/proxy | 9 ++++++--- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index b762b77..c28f2d5 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -26,30 +26,22 @@ APT::NeverAutoRemove }; /* Debug information: # dpkg list: -rc linux-image-3.16.0-4-amd64 3.16.7-ckt25-2 amd64 Linux 3.16 for 64-bit PCs -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) -rc linux-image-4.9.0-3-amd64 4.9.30-2+deb9u5 amd64 Linux 4.9 for 64-bit PCs -ii linux-image-4.9.0-4-amd64 4.9.65-3+deb9u1 amd64 Linux 4.9 for 64-bit PCs ii linux-image-4.9.0-5-amd64 4.9.65-3+deb9u2 amd64 Linux 4.9 for 64-bit PCs -iF linux-image-4.9.0-6-amd64 4.9.82-1+deb9u3 amd64 Linux 4.9 for 64-bit PCs +iF linux-image-4.9.0-6-amd64 4.9.88-1 amd64 Linux 4.9 for 64-bit PCs ii linux-image-amd64 4.9+80+deb9u4 amd64 Linux for 64-bit PCs (meta-package) # list of installed kernel packages: -4.9.0-4-amd64 4.9.65-3+deb9u1 4.9.0-5-amd64 4.9.65-3+deb9u2 -4.9.0-6-amd64 4.9.82-1+deb9u3 +4.9.0-6-amd64 4.9.88-1 # list of different kernel versions: -4.9.82-1+deb9u3 +4.9.88-1 4.9.65-3+deb9u2 -4.9.65-3+deb9u1 -# Installing kernel: 4.9.82-1+deb9u3 (4.9.0-6-amd64) -# Running kernel: 4.9.65-3+deb9u2 (4.9.0-5-amd64) -# Last kernel: 4.9.82-1+deb9u3 +# Installing kernel: 4.9.88-1 (4.9.0-6-amd64) +# Running kernel: 4.9.88-1 (4.9.0-6-amd64) +# Last kernel: 4.9.88-1 # Previous kernel: 4.9.65-3+deb9u2 # Kernel versions list to keep: 4.9.65-3+deb9u2 -4.9.82-1+deb9u3 +4.9.88-1 # Kernel packages (version part) to protect: 4\.9\.0-5-amd64 4\.9\.0-6-amd64 diff --git a/init.d/icinga2 b/init.d/icinga2 index 4ee354c..daad9a9 100755 --- a/init.d/icinga2 +++ b/init.d/icinga2 @@ -47,14 +47,16 @@ trap '' 13 # SIGPIPE # check run directory check_run () { - test -d '/var/run/icinga2' || mkdir /var/run/icinga2 - test -d '/var/run/icinga2/cmd' || mkdir /var/run/icinga2/cmd + if [ ! -e '/var/run/icinga2' ]; then + mkdir /var/run/icinga2 + mkdir /var/run/icinga2/cmd - chown "$DAEMON_USER":"$DAEMON_GROUP" /var/run/icinga2 - chmod 0755 /var/run/icinga2 + chown "$DAEMON_USER":"$DAEMON_CMDGROUP" /var/run/icinga2/cmd + chmod 2710 /var/run/icinga2/cmd - chown "$DAEMON_USER":"$DAEMON_CMDGROUP" /var/run/icinga2/cmd - chmod 2710 /var/run/icinga2/cmd + chown "$DAEMON_USER":"$DAEMON_GROUP" /var/run/icinga2 + chmod 0755 /var/run/icinga2 + fi } check_config () { @@ -128,7 +130,7 @@ do_reload() { # restarting (for example, when it is sent a SIGHUP), # then implement that here. # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --name $NAME return 0 } diff --git a/salt/minion b/salt/minion index 7420713..41b507b 100644 --- a/salt/minion +++ b/salt/minion @@ -635,9 +635,12 @@ # all data that has a result of True and no changes will be suppressed. #state_verbose: True -# The state_output setting changes if the output is the full multi line -# output for each changed state if set to 'full', but if set to 'terse' -# the output will be shortened to a single line. +# The state_output setting controls which results will be output full multi line +# full, terse - each state will be full/terse +# mixed - only states with errors will be full +# changes - states with changes and errors will be full +# full_id, mixed_id, changes_id and terse_id are also allowed; +# when set, the state ID will be used as name in the output #state_output: full # The state_output_diff setting changes whether or not the output from @@ -663,6 +666,12 @@ # certfile: # ssl_version: PROTOCOL_TLSv1_2 +# Grains to be sent to the master on authentication to check if the minion's key +# will be accepted automatically. Needs to be configured on the master. +#autosign_grains: +# - uuid +# - server_id + ###### Reactor Settings ##### ########################################### @@ -689,6 +698,12 @@ # for a full explanation. #multiprocessing: True +# Limit the maximum amount of processes or threads created by salt-minion. +# This is useful to avoid resource exhaustion in case the minion receives more +# publications than it is able to handle, as it limits the number of spawned +# processes or threads. -1 is the default and disables the limit. +#process_count_max: -1 + ##### Logging settings ##### ########################################## diff --git a/salt/proxy b/salt/proxy index f81dc32..908dd25 100644 --- a/salt/proxy +++ b/salt/proxy @@ -498,9 +498,12 @@ # all data that has a result of True and no changes will be suppressed. #state_verbose: True -# The state_output setting changes if the output is the full multi line -# output for each changed state if set to 'full', but if set to 'terse' -# the output will be shortened to a single line. +# The state_output setting controls which results will be output full multi line +# full, terse - each state will be full/terse +# mixed - only states with errors will be full +# changes - states with changes and errors will be full +# full_id, mixed_id, changes_id and terse_id are also allowed; +# when set, the state ID will be used as name in the output #state_output: full # The state_output_diff setting changes whether or not the output from -- 2.39.5