diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2012-01-09 06:51:53 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2012-01-09 06:51:53 +0000 |
| commit | 0400d460fe0a21275eb9393c5645419ae84c0ceb (patch) | |
| tree | d59bd36833e41477f884ae7e730ff0ed9b34ed94 | |
| parent | e26ac8f1388c46c5d87978a89eea0ed3d34bdcc1 (diff) | |
| download | sitesummary-0400d460fe0a21275eb9393c5645419ae84c0ceb.tar.gz sitesummary-0400d460fe0a21275eb9393c5645419ae84c0ceb.tar.bz2 sitesummary-0400d460fe0a21275eb9393c5645419ae84c0ceb.tar.xz | |
Only use includedir statement in munin configuration with
munin version 1.4.5 or newer.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | sitesummary-update-munin | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5f6ff55..617411e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sitesummary (0.1.0) UNRELEASED; urgency=low * Bump version number, as the package is getting closer to a production release. + * Only use includedir statement in munin configuration with + munin version 1.4.5 or newer. -- Petter Reinholdtsen <pere@debian.org> Mon, 26 Dec 2011 13:10:57 +0100 diff --git a/sitesummary-update-munin b/sitesummary-update-munin index b3faece..f1d4ce5 100755 --- a/sitesummary-update-munin +++ b/sitesummary-update-munin @@ -50,11 +50,18 @@ logdir $muninlogdir rundir $muninrundir tmpldir $munintmpldir +EOF + + # Munin supports the includedir statement since Squeeze + muninver=$(dpkg -l munin|grep munin|awk '{print $3}') + if dpkg --compare-versions "1.4.5" le "$muninver" ; then + cat <<EOF # (Exactly one) directory to include all files from. # includedir /etc/munin/munin-conf.d EOF + fi fi $nodes -m $muninopts |