From 82ddd5bc5ade6a93a3659a403445f274e0105fd3 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 8 Jul 2020 23:19:06 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -icinga2 2.11.2-1ubuntu3 amd64 -icinga2-bin 2.11.2-1ubuntu3 amd64 -icinga2-common 2.11.2-1ubuntu3 all -icinga2-doc 2.11.2-1ubuntu3 all -icinga2-ido-mysql 2.11.2-1ubuntu3 amd64 +icinga2 2.11.4-1.focal amd64 +icinga2-bin 2.11.4-1.focal amd64 +icinga2-common 2.11.4-1.focal all +icinga2-doc 2.11.4-1.focal all +icinga2-ido-mysql 2.11.4-1.focal amd64 --- .etckeeper | 82 ++++++++++++++++++-- init.d/icinga2 | 20 ++--- systemd/system/icinga2.service.d/limits.conf | 9 +++ 3 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 systemd/system/icinga2.service.d/limits.conf diff --git a/.etckeeper b/.etckeeper index 3c1357141..864178b4f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1243,49 +1243,117 @@ maybe chmod 0644 'hosts.deny' maybe chown 'nagios' 'icinga2' maybe chgrp 'nagios' 'icinga2' maybe chmod 0750 'icinga2' -maybe chmod 0755 'icinga2/conf.d' +maybe chown 'nagios' 'icinga2/conf.d' +maybe chgrp 'nagios' 'icinga2/conf.d' +maybe chmod 0750 'icinga2/conf.d' +maybe chown 'nagios' 'icinga2/conf.d/app.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/app.conf' maybe chmod 0644 'icinga2/conf.d/app.conf' +maybe chown 'nagios' 'icinga2/conf.d/apt.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/apt.conf' maybe chmod 0644 'icinga2/conf.d/apt.conf' +maybe chown 'nagios' 'icinga2/conf.d/commands.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/commands.conf' maybe chmod 0644 'icinga2/conf.d/commands.conf' +maybe chown 'nagios' 'icinga2/conf.d/downtimes.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/downtimes.conf' maybe chmod 0644 'icinga2/conf.d/downtimes.conf' +maybe chown 'nagios' 'icinga2/conf.d/groups.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/groups.conf' maybe chmod 0644 'icinga2/conf.d/groups.conf' +maybe chown 'nagios' 'icinga2/conf.d/hosts.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/hosts.conf' maybe chmod 0644 'icinga2/conf.d/hosts.conf' +maybe chown 'nagios' 'icinga2/conf.d/notifications.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/notifications.conf' maybe chmod 0644 'icinga2/conf.d/notifications.conf' +maybe chown 'nagios' 'icinga2/conf.d/services.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/services.conf' maybe chmod 0644 'icinga2/conf.d/services.conf' +maybe chown 'nagios' 'icinga2/conf.d/templates.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/templates.conf' maybe chmod 0644 'icinga2/conf.d/templates.conf' +maybe chown 'nagios' 'icinga2/conf.d/timeperiods.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/timeperiods.conf' maybe chmod 0644 'icinga2/conf.d/timeperiods.conf' +maybe chown 'nagios' 'icinga2/conf.d/users.conf' +maybe chgrp 'nagios' 'icinga2/conf.d/users.conf' maybe chmod 0644 'icinga2/conf.d/users.conf' -maybe chmod 0644 'icinga2/constants.conf' -maybe chmod 0755 'icinga2/features-available' +maybe chown 'nagios' 'icinga2/constants.conf' +maybe chgrp 'nagios' 'icinga2/constants.conf' +maybe chmod 0640 'icinga2/constants.conf' +maybe chown 'nagios' 'icinga2/features-available' +maybe chgrp 'nagios' 'icinga2/features-available' +maybe chmod 0750 'icinga2/features-available' +maybe chown 'nagios' 'icinga2/features-available/api.conf' +maybe chgrp 'nagios' 'icinga2/features-available/api.conf' maybe chmod 0644 'icinga2/features-available/api.conf' +maybe chown 'nagios' 'icinga2/features-available/checker.conf' +maybe chgrp 'nagios' 'icinga2/features-available/checker.conf' maybe chmod 0644 'icinga2/features-available/checker.conf' +maybe chown 'nagios' 'icinga2/features-available/command.conf' +maybe chgrp 'nagios' 'icinga2/features-available/command.conf' maybe chmod 0644 'icinga2/features-available/command.conf' +maybe chown 'nagios' 'icinga2/features-available/compatlog.conf' +maybe chgrp 'nagios' 'icinga2/features-available/compatlog.conf' maybe chmod 0644 'icinga2/features-available/compatlog.conf' +maybe chown 'nagios' 'icinga2/features-available/debuglog.conf' +maybe chgrp 'nagios' 'icinga2/features-available/debuglog.conf' maybe chmod 0644 'icinga2/features-available/debuglog.conf' +maybe chown 'nagios' 'icinga2/features-available/elasticsearch.conf' +maybe chgrp 'nagios' 'icinga2/features-available/elasticsearch.conf' maybe chmod 0644 'icinga2/features-available/elasticsearch.conf' +maybe chown 'nagios' 'icinga2/features-available/gelf.conf' +maybe chgrp 'nagios' 'icinga2/features-available/gelf.conf' maybe chmod 0644 'icinga2/features-available/gelf.conf' +maybe chown 'nagios' 'icinga2/features-available/graphite.conf' +maybe chgrp 'nagios' 'icinga2/features-available/graphite.conf' maybe chmod 0644 'icinga2/features-available/graphite.conf' +maybe chown 'nagios' 'icinga2/features-available/ido-mysql.conf' +maybe chgrp 'nagios' 'icinga2/features-available/ido-mysql.conf' maybe chmod 0644 'icinga2/features-available/ido-mysql.conf' +maybe chown 'nagios' 'icinga2/features-available/influxdb.conf' +maybe chgrp 'nagios' 'icinga2/features-available/influxdb.conf' maybe chmod 0644 'icinga2/features-available/influxdb.conf' +maybe chown 'nagios' 'icinga2/features-available/livestatus.conf' +maybe chgrp 'nagios' 'icinga2/features-available/livestatus.conf' maybe chmod 0644 'icinga2/features-available/livestatus.conf' +maybe chown 'nagios' 'icinga2/features-available/mainlog.conf' +maybe chgrp 'nagios' 'icinga2/features-available/mainlog.conf' maybe chmod 0644 'icinga2/features-available/mainlog.conf' +maybe chown 'nagios' 'icinga2/features-available/notification.conf' +maybe chgrp 'nagios' 'icinga2/features-available/notification.conf' maybe chmod 0644 'icinga2/features-available/notification.conf' +maybe chown 'nagios' 'icinga2/features-available/opentsdb.conf' +maybe chgrp 'nagios' 'icinga2/features-available/opentsdb.conf' maybe chmod 0644 'icinga2/features-available/opentsdb.conf' +maybe chown 'nagios' 'icinga2/features-available/perfdata.conf' +maybe chgrp 'nagios' 'icinga2/features-available/perfdata.conf' maybe chmod 0644 'icinga2/features-available/perfdata.conf' +maybe chown 'nagios' 'icinga2/features-available/statusdata.conf' +maybe chgrp 'nagios' 'icinga2/features-available/statusdata.conf' maybe chmod 0644 'icinga2/features-available/statusdata.conf' +maybe chown 'nagios' 'icinga2/features-available/syslog.conf' +maybe chgrp 'nagios' 'icinga2/features-available/syslog.conf' maybe chmod 0644 'icinga2/features-available/syslog.conf' maybe chown 'nagios' 'icinga2/features-enabled' maybe chgrp 'nagios' 'icinga2/features-enabled' maybe chmod 0750 'icinga2/features-enabled' -maybe chmod 0644 'icinga2/icinga2.conf' +maybe chown 'nagios' 'icinga2/icinga2.conf' +maybe chgrp 'nagios' 'icinga2/icinga2.conf' +maybe chmod 0640 'icinga2/icinga2.conf' maybe chown 'nagios' 'icinga2/pki' maybe chgrp 'nagios' 'icinga2/pki' maybe chmod 0700 'icinga2/pki' maybe chmod 0755 'icinga2/scripts' maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh' maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh' -maybe chmod 0644 'icinga2/zones.conf' -maybe chmod 0755 'icinga2/zones.d' +maybe chown 'nagios' 'icinga2/zones.conf' +maybe chgrp 'nagios' 'icinga2/zones.conf' +maybe chmod 0640 'icinga2/zones.conf' +maybe chown 'nagios' 'icinga2/zones.d' +maybe chgrp 'nagios' 'icinga2/zones.d' +maybe chmod 0750 'icinga2/zones.d' maybe chmod 0644 'icinga2/zones.d/README' maybe chgrp 'icingaweb2' 'icingaweb2' maybe chmod 2770 'icingaweb2' @@ -6297,6 +6365,8 @@ maybe chmod 0755 'systemd/system/default.target.wants' maybe chmod 0755 'systemd/system/emergency.target.wants' maybe chmod 0755 'systemd/system/getty.target.wants' maybe chmod 0755 'systemd/system/graphical.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/paths.target.wants' maybe chmod 0755 'systemd/system/rescue.target.wants' diff --git a/init.d/icinga2 b/init.d/icinga2 index 3abca95d2..daad9a948 100755 --- a/init.d/icinga2 +++ b/init.d/icinga2 @@ -23,12 +23,12 @@ DAEMON_GROUP=nagios DAEMON_CMDGROUP=www-data DAEMON_ARGS="-e /var/log/icinga2/icinga2.err" STARTUP_LOG="/var/log/icinga2/startup.log" -PIDFILE=/run/icinga2/$NAME.pid +PIDFILE=/var/run/icinga2/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME # Block/ignore SIGPIPE inside Icinga2 # Workaround for a known bug in 2.6.0 -# see https://github.com/Icinga/icinga2/issues/4867#issuecomment-273109525 +# see https://dev.icinga.com/issues/13567#note-19 trap '' 13 # SIGPIPE # Exit if the package is not installed @@ -47,14 +47,16 @@ trap '' 13 # SIGPIPE # check run directory check_run () { - test -d '/run/icinga2' || mkdir /run/icinga2 - test -d '/run/icinga2/cmd' || mkdir /run/icinga2/cmd + if [ ! -e '/var/run/icinga2' ]; then + mkdir /var/run/icinga2 + mkdir /var/run/icinga2/cmd - chown "$DAEMON_USER":"$DAEMON_GROUP" /run/icinga2 - chmod 0755 /run/icinga2 + chown "$DAEMON_USER":"$DAEMON_CMDGROUP" /var/run/icinga2/cmd + chmod 2710 /var/run/icinga2/cmd - chown "$DAEMON_USER":"$DAEMON_CMDGROUP" /run/icinga2/cmd - chmod 2710 /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/systemd/system/icinga2.service.d/limits.conf b/systemd/system/icinga2.service.d/limits.conf new file mode 100644 index 000000000..ad24f7ea6 --- /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 -- 2.43.0