diff options
| -rw-r--r-- | ChangeLog | 38 | ||||
| -rw-r--r-- | debian/changelog | 29 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | etc/cron.d/itzks-systems-mainserver | 2 | ||||
| -rw-r--r-- | etc/cron.d/itzks-systems-puppetserver | 2 | ||||
| -rwxr-xr-x | usr-lib-nagios-plugins/check_needs-rebooting.sh | 16 |
6 files changed, 83 insertions, 8 deletions
@@ -1,6 +1,40 @@ +2025-10-08 Mike Gabriel + + * release 2025.10.08.1 (HEAD -> master, tag: 2025.10.08.1) + * debian/control: Support Proxmox virtualistion servers by + itzks-systems-virtman bin:pkg. (8bace154) + +2025-10-06 Mike Gabriel + + * release 2025.10.06.4 (c7fce90b) (tag: 2025.10.06.4) + * usr-lib-nagios-plugins/check_needs-rebooting.sh: Refactor output. + (29ef41c2) + * usr-lib-nagios-plugins/check_needs-rebooting.sh: Don't use html + tags for line breaks, use ', ' and '\n' instead. + (d58a9404) + * release 2025.10.06.3 (7aad9ccd) (tag: 2025.10.06.3) + * /usr-lib-nagios-plugins/check_needs-rebooting.sh: Support being + used on ITZkS-branded Debian Edu systems. (4dbe5eb9) + * release 2025.10.06.2 (b63dddfa) (tag: 2025.10.06.2) + * debian/itzks-systems-faiserver.install: Add check_squid Icinga2 + check command to faiserver host. (8b9dc9d9) + * debian/*.install: Sort entries. (1b01c240) + * debian/*.install: Install check_needs-rebooting.sh Icinga2 check + command to all server types. (f48c2546) + * release 2025.10.06.1 (d1f9da06) (tag: 2025.10.06.1) + * share/debian-edu-config/tools/gosa-modify-host-itzks: Fix c+p flaw + in comment. (277f7e86) + * release 2025.09.30.1 (e2c13127) (tag: 2025.09.30.1) + +2025-09-30 Mike Gabriel + + * usr-lib-nagios-plugins/check_needs-rebooting.sh: Add monitoring + check_ command to check if a system needs rebooting. + (5094cff0) + 2025-09-17 Mike Gabriel - * release 2025.09.17.1 (HEAD -> master, tag: 2025.09.17.1) + * release 2025.09.17.1 (5e832a03) (tag: 2025.09.17.1) * sbin/itzks-update-disklserver-squashfs-images: Copy disklserver's /root/.ssh/known_hosts (or known_hosts.DLW into a freshly copied chroot if not already present). Required for SSH @@ -87,7 +121,7 @@ * release 2024.01.05.2 (651e24ed) * debian/control: Stop installing puppet on the main server. (0c3371ff) - * release 2024.01.05.1 (0b1ef8ff) + * release 2024.01.05.1 (0b1ef8ff) (tag: 2024.01.05.1) * debian/control: Drop memtest86 from all D: fields. Not in Debian 12 anymore. (60b37ffb) diff --git a/debian/changelog b/debian/changelog index bf71f2f..dfc8038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +itzks-systems (2026.02.17.1) unstable; urgency=medium + + * etc/cron.d/: Fix invocation of itzks-puppetserver-autosign-new-host- + certificates via CRON (previous wrong filename in config). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 17 Feb 2026 22:25:05 +0100 + +itzks-systems (2025.10.08.1) unstable; urgency=medium + + * debian/control: + + Support Proxmox virtualistion servers by itzks-systems-virtman bin:pkg. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Oct 2025 20:09:48 +0200 + +itzks-systems (2025.10.06.4) unstable; urgency=medium + + * usr-lib-nagios-plugins/check_needs-rebooting.sh: + - Don't use html tags for line breaks, use ', ' and '\n' instead. + - Refactor output. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 06 Oct 2025 17:29:14 +0200 + +itzks-systems (2025.10.06.3) unstable; urgency=medium + + * usr-lib-nagios-plugins/check_needs-rebooting.sh: + + Support being used on ITZkS-branded Debian Edu systems. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 06 Oct 2025 13:22:21 +0200 + itzks-systems (2025.10.06.2) unstable; urgency=medium * debian/*.install: diff --git a/debian/control b/debian/control index 87ec195..8dac381 100644 --- a/debian/control +++ b/debian/control @@ -1219,7 +1219,7 @@ Depends: etckeeper, firefox-esr, firefox-esr-l10n-de, - firmware-linux-free, + firmware-linux-free | pve-firmware, libvirt-daemon | ganeti | libvirt-bin, libvirt-daemon | ganeti-os-noop | libvirt-bin, gdisk, @@ -1238,7 +1238,7 @@ Depends: odt2txt, openvpn, postfix, - qemu-kvm, + qemu-kvm | pve-qemu-kvm, reportbug, sudo, sysstat, diff --git a/etc/cron.d/itzks-systems-mainserver b/etc/cron.d/itzks-systems-mainserver index 341d0f2..f253c5f 100644 --- a/etc/cron.d/itzks-systems-mainserver +++ b/etc/cron.d/itzks-systems-mainserver @@ -2,4 +2,4 @@ MAILTO=root PATH=/usr/bin:/bin:/usr/sbin:/sbin # run puppet auto-CSR signing hourly -0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppet-autosign-new-host-certificates ] && /usr/sbin/itzks-puppet-autosign-new-host-certificates +0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppetserver-autosign-new-host-certificates ] && /usr/sbin/itzks-puppetserver-autosign-new-host-certificates diff --git a/etc/cron.d/itzks-systems-puppetserver b/etc/cron.d/itzks-systems-puppetserver index 341d0f2..f253c5f 100644 --- a/etc/cron.d/itzks-systems-puppetserver +++ b/etc/cron.d/itzks-systems-puppetserver @@ -2,4 +2,4 @@ MAILTO=root PATH=/usr/bin:/bin:/usr/sbin:/sbin # run puppet auto-CSR signing hourly -0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppet-autosign-new-host-certificates ] && /usr/sbin/itzks-puppet-autosign-new-host-certificates +0 7,8,9,10,11,12,13,14,15,16,17 * * * root [ -d /etc/puppet ] && [ -x /usr/sbin/itzks-puppetserver-autosign-new-host-certificates ] && /usr/sbin/itzks-puppetserver-autosign-new-host-certificates diff --git a/usr-lib-nagios-plugins/check_needs-rebooting.sh b/usr-lib-nagios-plugins/check_needs-rebooting.sh index d12f2ea..9a9495c 100755 --- a/usr-lib-nagios-plugins/check_needs-rebooting.sh +++ b/usr-lib-nagios-plugins/check_needs-rebooting.sh @@ -149,7 +149,11 @@ function CheckDebianRebootRequired() { EXIT_MSG=$OK_MSG EXIT_CODE=$OK_EXIT_CODE fi - EXIT_MSG_BODY="`cat ${REBOOT_REQUIRED_PATH}`<br/>Packages:<br/>`cat ${REBOOT_REQUIRED_PKGS_PATH} | sed ':a;N;$!ba;s/\n/<br\/>/g'`|Packages=${NR_OF_PACKAGES};${WARNING_LEVEL//-1/};${CRITICAL_LEVEL//-1/};0" + EXIT_MSG_BODY="`cat ${REBOOT_REQUIRED_PATH}`" + if [[ -n "${EXIT_MSG_BODY}" ]]; then + EXIT_MSG_BODY="${EXIT_MSG_BODY}\n\n" + fi + EXIT_MSG_BODY="${EXIT_MSG_BODY}Packages:\n`cat ${REBOOT_REQUIRED_PKGS_PATH} | sed -e '/^\$/d'`|Packages=${NR_OF_PACKAGES};${WARNING_LEVEL//-1/};${CRITICAL_LEVEL//-1/};0" else if [[ ${STATUS} = "w" ]]; then EXIT_MSG=$WARNING_MSG @@ -255,5 +259,13 @@ case `distro_name` in esac # Echo message and exit -echo "${EXIT_MSG}: ${EXIT_MSG_BODY}" +PACKAGES="packages need to be upgraded" +if [[ "x${NR_OF_PACKAGES}" = "x1" ]]; then + PACKAGES="package needs to be upgraded" +fi +if [[ ${NR_OF_PACKAGES} -gt 0 ]]; then + echo -e "${EXIT_MSG}: ${NR_OF_PACKAGES} ${PACKAGES}\n${EXIT_MSG_BODY}" +else + echo -e "${EXIT_MSG}: ${EXIT_MSG_BODY}" +fi exit $EXIT_CODE |