diff options
Diffstat (limited to 'sysutils/munin-node')
-rw-r--r-- | sysutils/munin-node/Makefile | 106 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-node__munin-node.conf.in (renamed from sysutils/munin-node/files/patch-munin-node.conf.in) | 10 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in (renamed from sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff) | 6 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in (renamed from sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff) | 4 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in | 4 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in | 8 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in | 12 | ||||
-rw-r--r-- | sysutils/munin-node/pkg-plist | 114 |
8 files changed, 117 insertions, 147 deletions
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 0689947295b4..b8f5e9d7a819 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -3,7 +3,7 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node @@ -23,57 +23,30 @@ RUN_DEPENDS= p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \ p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \ bash:${PORTSDIR}/shells/bash -DISTINFO_FILE= ${MUNIN_DISTINFO} -EXTRA_PATCHES+= ${MUNIN_PATCHES} USES= gmake perl5 shebangfix PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" -SHEBANG_FILES= node/sbin/munin-node +SHEBANG_FILES= node/sbin/munin-node node/sbin/munin-sched \ + node/sbin/munin-run node/sbin/munin-node-configure -NO_STAGE= yes .include "${.CURDIR}/../munin-common/munin.mk" +DISTINFO_FILE= ${MUNIN_DISTINFO} +EXTRA_PATCHES+= ${MUNIN_PATCHES} ALL_TARGET= build-node build-plugins INSTALL_TARGET= install-node-prime install-plugins-prime -OPTIONS_DEFINE= SNMP +OPTIONS_DEFINE= SNMP JAVA OPTIONS_DEFAULT= SNMP -SNMP_DESC= Include support for SNMP plugins +OPTIONS_SUB= yes +SNMP_DESC= Include SNMP plugins +JAVA_DESC= Include JAVA plugins -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSNMP} -BUILD_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP -RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP -.endif - -MAN1= munin-node-configure.1 \ - munin-node.1 \ - munin-run.1 \ - munin-sched.1 \ - munindoc.1 -MAN3_NODE= Munin::Node::Config.3 \ - Munin::Node::Configure::Debug.3 \ - Munin::Node::Configure::History.3 \ - Munin::Node::Configure::HostEnumeration.3 \ - Munin::Node::Configure::Plugin.3 \ - Munin::Node::Configure::PluginList.3 \ - Munin::Node::Logger.3 \ - Munin::Node::OS.3 \ - Munin::Node::ProxySpooler.3 \ - Munin::Node::SNMPConfig.3 \ - Munin::Node::Server.3 \ - Munin::Node::Service.3 \ - Munin::Node::Session.3 \ - Munin::Node::SpoolReader.3 \ - Munin::Node::SpoolWriter.3 \ - Munin::Node::Utils.3 -MAN3_PLUGIN= Munin::Plugin.3 \ - Munin::Plugin::Pgsql.3 \ - Munin::Plugin::SNMP.3 -MAN3= ${MAN3_NODE} ${MAN3_PLUGIN} -MAN5= munin-node.conf.5 -MAN8= munin.8 +SNMP_BUILD_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP +SNMP_RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP +JAVA_USE= java=yes +JAVA_INSTALL_TARGET= install-plugins-java +JAVA_BUILD= yes SUB_FILES= pkg-message USE_RC_SUBR= munin-node munin-sched @@ -92,43 +65,20 @@ post-patch: ${WRKSRC}/Makefile.config @${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete -pre-su-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/munin-node \ - ${PREFIX}/etc/rc.d/munin-node - @${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ - ${ETCDIR}/munin-node.conf.sample - @if [ ! -f ${ETCDIR}/munin-node.conf ]; then \ - ${INSTALL_DATA} ${ETCDIR}/munin-node.conf.sample \ - ${ETCDIR}/munin-node.conf; \ - fi - @${INSTALL_DATA} ${FILESDIR}/plugins.conf \ - ${ETCDIR}/plugin-conf.d/plugins.conf.sample - @if [ ! -f ${ETCDIR}/plugin-conf.d/plugins.conf ]; then \ - ${INSTALL_DATA} ${ETCDIR}/plugin-conf.d/plugins.conf.sample \ - ${ETCDIR}/plugin-conf.d/plugins.conf; \ - fi - @(cd ${WRKSRC}/node/blib/bindoc && for man in ${MAN1}; do \ - ${INSTALL_MAN} -C $$man ${PREFIX}/man/man1; \ - done) - @(cd ${WRKSRC}/node/blib/libdoc && for man in ${MAN3_NODE}; do \ - ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ - done) - @(cd ${WRKSRC}/plugins/blib/libdoc && for man in ${MAN3_PLUGIN}; do \ - ${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \ - done) - @(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \ - ${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \ - done) - @(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \ - ${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \ - done) - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${ECHO} ${PORTVERSION} > /tmp/.munin-node.version - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state + ${INSTALL_SCRIPT} ${WRKDIR}/munin-node \ + ${STAGEDIR}${PREFIX}/etc/rc.d/munin-node + ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ + ${STAGEDIR}${ETCDIR}/munin-node.conf.sample + ${INSTALL_DATA} ${FILESDIR}/plugins.conf \ + ${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample + (cd ${WRKSRC}/node/blib/bindoc; \ + ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ + ) + (cd ${WRKSRC}/build/doc; \ + ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ + ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ + ) .include <bsd.port.mk> diff --git a/sysutils/munin-node/files/patch-munin-node.conf.in b/sysutils/munin-node/files/patch-node__munin-node.conf.in index 8284ed61f943..10ab0fa8bb48 100644 --- a/sysutils/munin-node/files/patch-munin-node.conf.in +++ b/sysutils/munin-node/files/patch-node__munin-node.conf.in @@ -1,5 +1,5 @@ ---- ./node/munin-node.conf.in.orig 2011-02-17 00:25:32.000000000 +0100 -+++ ./node/munin-node.conf.in 2011-02-17 00:25:47.000000000 +0100 +--- node/munin-node.conf.in.orig 2013-07-19 16:30:03 UTC ++++ node/munin-node.conf.in @@ -10,7 +10,7 @@ setsid 1 @@ -7,9 +7,9 @@ -group root +group wheel - # Regexps for files to ignore - -@@ -22,6 +22,7 @@ + # This is the timeout for the whole transaction. + # Units are in sec. Default is 15 min +@@ -30,6 +30,7 @@ ignore_file \.dpkg-(tmp|new|old|dist)$ ignore_file \.rpm(save|new)$ ignore_file \.pod$ diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in index ff4aa9183927..addddd9e0bde 100644 --- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in @@ -1,6 +1,6 @@ ---- plugins/node.d.freebsd/if_.in.orig 2009-12-30 13:55:55.000000000 +0100 -+++ plugins/node.d.freebsd/if_.in 2010-02-24 18:59:15.670282185 +0100 -@@ -81,9 +81,12 @@ +--- plugins/node.d.freebsd/if_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/if_.in +@@ -83,9 +83,12 @@ if (NF == 10) { print "rbytes.value", $6; print "obytes.value", $9; diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in index 83b671655aaf..976422e790c0 100644 --- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in @@ -1,5 +1,5 @@ ---- plugins/node.d.freebsd/if_errcoll_.in.orig 2009-12-30 13:55:55.000000000 +0100 -+++ plugins/node.d.freebsd/if_errcoll_.in 2010-02-24 19:00:26.026407278 +0100 +--- plugins/node.d.freebsd/if_errcoll_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/if_errcoll_.in @@ -59,9 +59,13 @@ print "ierrors.value", $5; print "oerrors.value", $8; diff --git a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in index b63336f3243a..c0a973d87a4b 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in @@ -1,5 +1,5 @@ ---- ./plugins/node.d.freebsd/iostat.in.orig 2012-07-11 14:14:27.841196443 +0200 -+++ ./plugins/node.d.freebsd/iostat.in 2012-07-11 14:14:32.619552027 +0200 +--- plugins/node.d.freebsd/iostat.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/iostat.in @@ -56,13 +56,11 @@ for d in $drives; do echo "${d}_read.label ${d}" diff --git a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in index ca6daea50fd7..13ce4b37db37 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in +++ b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in @@ -1,7 +1,7 @@ ---- plugins/node.d/hddtemp_smartctl.in.orig 2012-09-11 11:26:15.928249255 +0200 -+++ plugins/node.d/hddtemp_smartctl.in 2012-09-11 11:26:48.947249274 +0200 -@@ -151,7 +151,7 @@ - # without probing them. +--- plugins/node.d/hddtemp_smartctl.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d/hddtemp_smartctl.in +@@ -162,7 +162,7 @@ + } elsif ($^O eq 'freebsd') { opendir(DEV, '/dev'); - @drives = grep /^ad[0-9]+$/, readdir DEV; diff --git a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in index afc73b8fd4f5..d602b6742cc7 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in +++ b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in @@ -1,6 +1,6 @@ ---- ./plugins/node.d/squeezebox_.in.orig 2012-08-14 17:19:40.000000000 +0200 -+++ ./plugins/node.d/squeezebox_.in 2012-08-27 13:55:40.573530762 +0200 -@@ -156,7 +156,7 @@ +--- plugins/node.d/squeezebox_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d/squeezebox_.in +@@ -157,7 +157,7 @@ printf "graph_order y" echo $years_array | sed 's/ / y/g' @@ -9,7 +9,7 @@ year=$(echo ${arr1[$i]}) if [ $year = 0 ]; then echo y0.label No year -@@ -171,7 +171,7 @@ +@@ -172,7 +172,7 @@ done exit 0 fi @@ -18,7 +18,7 @@ year=$(echo ${arr1[$i]}) printf "y%s.value " ${year} printf "%b" "albums 0 0 year:${year}\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 3 -@@ -182,7 +182,7 @@ +@@ -183,7 +183,7 @@ echo "graph_category Squeezebox" COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) @@ -27,7 +27,7 @@ MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g') NAME=$(printf "%b" "player name $MAC ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%20/ /g') MAC2=$(echo $MAC | sed 's/://g; s/\./_/g') -@@ -192,7 +192,7 @@ +@@ -193,7 +193,7 @@ fi COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist index 5a86fb8e9125..6217737b7263 100644 --- a/sysutils/munin-node/pkg-plist +++ b/sysutils/munin-node/pkg-plist @@ -1,11 +1,6 @@ -@stopdaemon munin-node bin/munindoc -@unexec if cmp -s %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; then rm -f %D/%%ETCDIR%%/munin-node.conf ; fi -%%ETCDIR%%/munin-node.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/munin-node.conf ] ; then cp -p %D/%%ETCDIR%%/munin-node.conf.sample %D/%%ETCDIR%%/munin-node.conf ; fi -@unexec if cmp -s %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; then rm -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi -%%ETCDIR%%/plugin-conf.d/plugins.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ] ; then cp -p %D/%%ETCDIR%%/plugin-conf.d/plugins.conf.sample %D/%%ETCDIR%%/plugin-conf.d/plugins.conf ; fi +@sample %%ETCDIR%%/munin-node.conf.sample +@sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample %%SITE_PERL%%/Munin/Node/Config.pm %%SITE_PERL%%/Munin/Node/Configure/Debug.pm %%SITE_PERL%%/Munin/Node/Configure/History.pm @@ -25,10 +20,37 @@ bin/munindoc %%SITE_PERL%%/Munin/Plugin.pm %%SITE_PERL%%/Munin/Plugin/Pgsql.pm %%SITE_PERL%%/Munin/Plugin/SNMP.pm +man/man1/munin-node-configure.1.gz +man/man1/munin-node.1.gz +man/man1/munin-run.1.gz +man/man1/munin-sched.1.gz +man/man1/munindoc.1.gz +man/man3/Munin::Node::Config.3.gz +man/man3/Munin::Node::Configure::Debug.3.gz +man/man3/Munin::Node::Configure::History.3.gz +man/man3/Munin::Node::Configure::HostEnumeration.3.gz +man/man3/Munin::Node::Configure::Plugin.3.gz +man/man3/Munin::Node::Configure::PluginList.3.gz +man/man3/Munin::Node::Logger.3.gz +man/man3/Munin::Node::OS.3.gz +man/man3/Munin::Node::ProxySpooler.3.gz +man/man3/Munin::Node::SNMPConfig.3.gz +man/man3/Munin::Node::Server.3.gz +man/man3/Munin::Node::Service.3.gz +man/man3/Munin::Node::Session.3.gz +man/man3/Munin::Node::SpoolReader.3.gz +man/man3/Munin::Node::SpoolWriter.3.gz +man/man3/Munin::Node::Utils.3.gz +man/man3/Munin::Plugin.3.gz +man/man3/Munin::Plugin::Pgsql.3.gz +man/man3/Munin::Plugin::SNMP.3.gz +man/man5/munin-node.conf.5.gz +man/man8/munin.8.gz sbin/munin-node sbin/munin-node-configure sbin/munin-run sbin/munin-sched +%%JAVA%%%%DATADIR%%/munin-jmx-plugins.jar %%DATADIR%%/plugins/amavis %%DATADIR%%/plugins/apache_accesses %%DATADIR%%/plugins/apache_processes @@ -86,6 +108,8 @@ sbin/munin-sched %%DATADIR%%/plugins/ipmi_ %%DATADIR%%/plugins/ipmi_sensor_ %%DATADIR%%/plugins/ircu +%%JAVA%%%%DATADIR%%/plugins/jmx_ +%%JAVA%%%%DATADIR%%/plugins/jmx_tomcat_dbpools %%DATADIR%%/plugins/load %%DATADIR%%/plugins/loggrep %%DATADIR%%/plugins/lpstat @@ -168,35 +192,35 @@ sbin/munin-sched %%DATADIR%%/plugins/slapd_bdb_cache_ %%DATADIR%%/plugins/slony_lag_ %%DATADIR%%/plugins/smart_ -%%DATADIR%%/plugins/snmp__cpuload -%%DATADIR%%/plugins/snmp__df -%%DATADIR%%/plugins/snmp__df_ram -%%DATADIR%%/plugins/snmp__fc_if_ -%%DATADIR%%/plugins/snmp__fc_if_err_ -%%DATADIR%%/plugins/snmp__if_ -%%DATADIR%%/plugins/snmp__if_err_ -%%DATADIR%%/plugins/snmp__if_multi -%%DATADIR%%/plugins/snmp__load -%%DATADIR%%/plugins/snmp__memory -%%DATADIR%%/plugins/snmp__netapp_diskusage_ -%%DATADIR%%/plugins/snmp__netapp_inodeusage_ -%%DATADIR%%/plugins/snmp__netstat -%%DATADIR%%/plugins/snmp__print_pages -%%DATADIR%%/plugins/snmp__print_supplies -%%DATADIR%%/plugins/snmp__processes -%%DATADIR%%/plugins/snmp__rdp_users -%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan -%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp -%%DATADIR%%/plugins/snmp__sensors_fsc_fan -%%DATADIR%%/plugins/snmp__sensors_fsc_temp -%%DATADIR%%/plugins/snmp__sensors_mbm_fan -%%DATADIR%%/plugins/snmp__sensors_mbm_temp -%%DATADIR%%/plugins/snmp__sensors_mbm_volt -%%DATADIR%%/plugins/snmp__swap -%%DATADIR%%/plugins/snmp__uptime -%%DATADIR%%/plugins/snmp__users -%%DATADIR%%/plugins/snmp__winload -%%DATADIR%%/plugins/snmp__winmem +%%SNMP%%%%DATADIR%%/plugins/snmp__cpuload +%%SNMP%%%%DATADIR%%/plugins/snmp__df +%%SNMP%%%%DATADIR%%/plugins/snmp__df_ram +%%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_ +%%SNMP%%%%DATADIR%%/plugins/snmp__fc_if_err_ +%%SNMP%%%%DATADIR%%/plugins/snmp__if_ +%%SNMP%%%%DATADIR%%/plugins/snmp__if_err_ +%%SNMP%%%%DATADIR%%/plugins/snmp__if_multi +%%SNMP%%%%DATADIR%%/plugins/snmp__load +%%SNMP%%%%DATADIR%%/plugins/snmp__memory +%%SNMP%%%%DATADIR%%/plugins/snmp__netapp_diskusage_ +%%SNMP%%%%DATADIR%%/plugins/snmp__netapp_inodeusage_ +%%SNMP%%%%DATADIR%%/plugins/snmp__netstat +%%SNMP%%%%DATADIR%%/plugins/snmp__print_pages +%%SNMP%%%%DATADIR%%/plugins/snmp__print_supplies +%%SNMP%%%%DATADIR%%/plugins/snmp__processes +%%SNMP%%%%DATADIR%%/plugins/snmp__rdp_users +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_fan +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_bx_temp +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_fan +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_fsc_temp +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_fan +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_temp +%%SNMP%%%%DATADIR%%/plugins/snmp__sensors_mbm_volt +%%SNMP%%%%DATADIR%%/plugins/snmp__swap +%%SNMP%%%%DATADIR%%/plugins/snmp__uptime +%%SNMP%%%%DATADIR%%/plugins/snmp__users +%%SNMP%%%%DATADIR%%/plugins/snmp__winload +%%SNMP%%%%DATADIR%%/plugins/snmp__winmem %%DATADIR%%/plugins/snort_alerts %%DATADIR%%/plugins/snort_bytes_pkt %%DATADIR%%/plugins/snort_drop_rate @@ -224,16 +248,12 @@ sbin/munin-sched %%DATADIR%%/plugins/varnish_ %%DATADIR%%/plugins/vmstat %%DATADIR%%/plugins/zimbra_ -@dirrm %%DATADIR%%/plugins -@dirrmtry %%DATADIR%% -@dirrm %%SITE_PERL%%/Munin/Plugin -@dirrm %%SITE_PERL%%/Munin/Node/Configure -@dirrm %%SITE_PERL%%/Munin/Node -@dirrmtry %%SITE_PERL%%/Munin -@exec mkdir -p %D/%%ETCDIR%%/plugins -@dirrmtry %%ETCDIR%%/plugins -@exec mkdir -p %D/%%ETCDIR%%/plugin-conf.d @dirrmtry %%ETCDIR%%/plugin-conf.d +@dirrmtry %%ETCDIR%%/plugins @dirrmtry %%ETCDIR%% -@cwd /var -@dirrmtry munin/plugin-state +@dirrmtry %%SITE_PERL%%/Munin/Node/Configure +@dirrmtry %%SITE_PERL%%/Munin/Node +@dirrmtry %%SITE_PERL%%/Munin/Plugin +@dirrmtry %%DATADIR%%/plugins +@dirrmtry %%DATADIR%% +@dirrmtry(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state |