[debian-edu-commits] debian-edu/ 02/02: Add partial fix for incorrect Nagios configuration, calling dpkg-reconfigure sitesummary after nagios3 is guaranteed to be installed. Still not working, as /etc/default/nagios3 is ignored with systemd.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 0d7b17a512df7dbd17e6bcd8c28e05a8789b6999
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 10 09:55:51 2014 +0200

    Add partial fix for incorrect Nagios configuration, calling dpkg-reconfigure sitesummary after nagios3 is guaranteed to be installed.  Still not working, as /etc/default/nagios3 is ignored with systemd.
---
 cf/cf.nagios3    | 8 ++++++++
 debian/changelog | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/cf/cf.nagios3 b/cf/cf.nagios3
index ce42988..b64a3a5 100644
--- a/cf/cf.nagios3
+++ b/cf/cf.nagios3
@@ -14,3 +14,11 @@ files:
     # the web server runs as, but I will not change this close to release.
     # 20100121, werner
     /etc/nagios3/htpasswd.users owner=root group=root mode=644 act=touch
+
+# Workaround for a variant of bug #760084 triggered by #483997,
+# apt/dpkg do not order recommends and suggests, causing sitesummary
+# to be installed before nagios3, and thus failing to configure
+# nagios3 properly.
+shellcommands:
+  debian.fifthpass::
+    "/usr/sbin/dpkg-reconfigure sitesummary"
diff --git a/debian/changelog b/debian/changelog
index 90c83d5..5622de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     installed packages uses.
   * Adjust PXE installation arguments to put all d-i arguments before
     the -- on the kernel argument line.
+  * Add partial fix for incorrect Nagios configuration, calling
+    dpkg-reconfigure sitesummary after nagios3 is guaranteed to be
+    installed.  Still not working, as /etc/default/nagios3 is ignored
+    with systemd.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 07 Oct 2014 12:47:06 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git