diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-01-28 08:13:13 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2010-01-28 08:13:13 +0000 |
| commit | 65224bdd3656229b8f0257c3d0df79edc677c146 (patch) | |
| tree | 51cc5db2deadc68603b9d34bc3d7418a7d6149e0 | |
| parent | 4e528907d151816acbfdc5df9afe3c5b8a5d3dd0 (diff) | |
| download | sitesummary-65224bdd3656229b8f0257c3d0df79edc677c146.tar.gz sitesummary-65224bdd3656229b8f0257c3d0df79edc677c146.tar.bz2 sitesummary-65224bdd3656229b8f0257c3d0df79edc677c146.tar.xz | |
Change munin configuration to use /var/cache/munin/www/ if it
exist, to work out of the box with munin 1.4.0 (Closes: #567168).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | sitesummary-update-munin | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index dd7cae0..f138c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ sitesummary (0.0.59) UNRELEASED; urgency=low only remove illegal characters for the munin key. * Adjust sitesummary postinst to only try to enable nagios autoconfig if /etc/default/nagios3 exist. + * Change munin configuration to use /var/cache/munin/www/ if it + exist, to work out of the box with munin 1.4.0 (Closes: #567168). -- Petter Reinholdtsen <pere@debian.org> Tue, 26 Jan 2010 08:56:53 +0100 diff --git a/sitesummary-update-munin b/sitesummary-update-munin index e94f23e..2bf4b8c 100755 --- a/sitesummary-update-munin +++ b/sitesummary-update-munin @@ -26,6 +26,12 @@ generate_munin_config() { cat $MUNINDIR/munin.conf.pre else # Copy of active config from munin version 1.2.5-1 + if [ -d /var/cache/munin/www ] ; then + # Used since munin version 1.4.0-1 + htmldir="/var/cache/munin/www" + else + htmldir="/var/www/munin" + fi cat <<EOF # Munin server configuration generated from cron using sitesummary # data by $0 @@ -34,7 +40,7 @@ generate_munin_config() { # $MUNINDIR/munin.conf.post instead. dbdir /var/lib/munin -htmldir /var/www/munin +htmldir $htmldir logdir /var/log/munin rundir /var/run/munin tmpldir /etc/munin/templates |