diff options
| -rwxr-xr-x | sitesummary-update-munin | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/sitesummary-update-munin b/sitesummary-update-munin index 2bf4b8c..d69c713 100755 --- a/sitesummary-update-munin +++ b/sitesummary-update-munin @@ -11,6 +11,18 @@ muninopts="" # the default munin configuration. MUNINDIR=/var/lib/sitesummary +if [ -d /var/cache/munin/www ] ; then + # Used since munin version 1.4.0-1 + muninhtmldir="/var/cache/munin/www" +else + muninhtmldir="/var/www/munin" +fi +# Based on of active config from munin version 1.2.5-1 +munindbdir=/var/lib/munin +muninlogdir=/var/log/munin +muninrundir=/var/run/munin +munintmpldir=/etc/munin/templates + [ -f /etc/sitesummary/collector.cfg ] && . /etc/sitesummary/collector.cfg # The storage area is not configurable, because too many scripts have @@ -25,13 +37,6 @@ generate_munin_config() { if [ -f $MUNINDIR/munin.conf.pre ] ; then 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 @@ -39,11 +44,11 @@ generate_munin_config() { # Edit $MUNINDIR/munin.conf.pre and # $MUNINDIR/munin.conf.post instead. -dbdir /var/lib/munin -htmldir $htmldir -logdir /var/log/munin -rundir /var/run/munin -tmpldir /etc/munin/templates +dbdir $munindbdir +htmldir $muninhtmldir +logdir $muninlogdir +rundir $muninrundir +tmpldir $munintmpldir EOF fi |