diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm --- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:13:31.731593251 +0000 @@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) . our $DROPDOWNLIMIT = 1; our $MUNIN_PREFIX = ''; -our $MUNIN_CONFDIR = "$COMPONENT_ROOT/t/config/"; +our $MUNIN_MCONFDIR = "$COMPONENT_ROOT/t/config/"; +our $MUNIN_NCONFDIR = "$COMPONENT_ROOT/t/config/"; our $MUNIN_BINDIR = ''; our $MUNIN_SBINDIR = ''; our $MUNIN_DOCDIR = ''; diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc/installation/configuration.rst --- munin-2.0.25.orig/doc/installation/configuration.rst 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/doc/installation/configuration.rst 2015-09-08 10:13:31.732593251 +0000 @@ -9,7 +9,7 @@ Plugins ------- Decide which plugins to use. The munin node runs all plugins present -in CONFDIR/plugins/ +in NCONFDIR/plugins/ The quick auto-plug-and-play solution: @@ -59,7 +59,7 @@ Master Add some nodes -------------- -Add some nodes to CONFDIR/munin.conf +Add some nodes to MCONFDIR/munin.conf [node.example.com] address 192.0.2.4 diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile --- munin-2.0.25.orig/Makefile 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/Makefile 2015-09-08 10:13:31.733593251 +0000 @@ -56,7 +56,7 @@ uninstall: # a new config. Target _only_ suitable for maintainers. unconfig: rm -f $(HTMLDIR)/.htaccess - rm -f $(CONFDIR)/munin.conf + rm -f $(MCONFDIR)/munin.conf tags: -rm -f TAGS @@ -71,14 +71,15 @@ install-pre: Makefile Makefile.config mkdir -p $(LOGDIR) mkdir -p $(STATEDIR) mkdir -p $(SPOOLDIR) - mkdir -p $(CONFDIR) + mkdir -p $(NCONFDIR) + mkdir -p $(MCONFDIR) $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) install-master-prime: $(INFILES_MASTER) install-pre install-master mkdir -p $(TEMPLATEDIR) mkdir -p $(TEMPLATEDIR)/static mkdir -p $(TEMPLATEDIR)/partial - mkdir -p $(CONFDIR)/munin-conf.d + mkdir -p $(MCONFDIR)/munin-conf.d mkdir -p $(LIBDIR) mkdir -p $(BINDIR) mkdir -p $(SBINDIR) @@ -111,7 +112,7 @@ install-master-prime: $(INFILES_MASTER) $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ + test -f "$(MCONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(MCONFDIR)/ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/ $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/ @@ -140,14 +141,14 @@ endif install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d + mkdir -p $(NCONFDIR)/plugins + mkdir -p $(NCONFDIR)/plugin-conf.d mkdir -p $(LIBDIR)/plugins mkdir -p $(PLUGSTATE) $(CHOWN) root:root $(PLUGSTATE) $(CHMOD) 0755 $(PLUGSTATE) - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ @@ -184,7 +185,7 @@ install-async: install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre - test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ + test -f "$(NCONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(NCONFDIR)/ install-common-prime: build-common install-common @@ -220,7 +221,8 @@ build/%: %.in @echo "$< -> $@" @mkdir -p build/`dirname $<` @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ - -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ + -e 's|@@MCONFDIR@@|$(MCONFDIR)|g' \ + -e 's|@@NCONFDIR@@|$(NCONFDIR)|g' \ -e 's|@@BINDIR@@|$(BINDIR)|g' \ -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ @@ -301,7 +303,8 @@ build-common-pre: common/Build common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre rm -f common/blib/lib/Munin/Common/Defaults.pm $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \ - s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \ + s{(MCONFDIR \s+=\s).*}{\1q{$(MCONFDIR)};}x; \ + s{(NCONFDIR \s+=\s).*}{\1q{$(NCONFDIR)};}x; \ s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \ s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \ @@ -428,7 +431,7 @@ old-test: t/*.t $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env -old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) +old-test: t/*.t t/install $(addprefix $(NCONFDIR)/plugins/,$(test_plugins)) @for test in t/*.t; do \ echo -n "$$test: "; \ PERL5LIB=$(PERLLIB) $(PERL) $$test;\ @@ -436,10 +439,10 @@ old-test: t/*.t t/install $(addprefix $( endif node-monkeywrench: install-node - rm -rf $(CONFDIR)/plugins + rm -rf $(NCONFDIR)/plugins rm -rf $(LIBDIR)/plugins mkdir -p $(LIBDIR)/plugins - mkdir -p $(CONFDIR)/plugins + mkdir -p $(NCONFDIR)/plugins cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ $(SBINDIR)/munin-node-configure --suggest echo 'Done?' diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config --- munin-2.0.25.orig/Makefile.config 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/Makefile.config 2015-09-08 10:13:31.733593251 +0000 @@ -20,7 +20,8 @@ PREFIX = $(DESTDIR)/usr # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/munin +NCONFDIR = $(DESTDIR)/etc/munin +MCONFDIR = $(DESTDIR)/etc/webapps/munin # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/_bin/munin-cgi-graph.in --- munin-2.0.25.orig/master/_bin/munin-cgi-graph.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/_bin/munin-cgi-graph.in 2015-09-08 10:13:31.734593251 +0000 @@ -44,7 +44,7 @@ use Munin::Master::Logger; use Log::Log4perl qw( :easy ); my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph"; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; my %period = ( "day" => 300, "week" => 1800, diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin/munin-check.in --- munin-2.0.25.orig/master/_bin/munin-check.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/_bin/munin-check.in 2015-09-08 10:13:31.734593251 +0000 @@ -163,7 +163,7 @@ done norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@ norec=yes perm_ok @@PLUGSTATE@@ 775 -norec=yes perm_ok @@CONFDIR@@/plugin-conf.d 755 +norec=yes perm_ok @@NCONFDIR@@/plugin-conf.d 755 echo "Check done. Please note that this script only checks most things," echo "not all things." diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin/munin-graph.in --- munin-2.0.25.orig/master/_bin/munin-graph.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/_bin/munin-graph.in 2015-09-08 10:13:31.735593251 +0000 @@ -51,7 +51,7 @@ use Munin::Master::Logger; use Log::Log4perl qw( :easy ); my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph"; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; my %period = ( "day" => 300, "week" => 1800, diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bin/munin-limits.in --- munin-2.0.25.orig/master/_bin/munin-limits.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/_bin/munin-limits.in 2015-09-08 10:13:31.735593251 +0000 @@ -66,7 +66,7 @@ Limit contacts to those of Econtact< =item B<< --config >> -Use EfileE as configuration file. [@@CONFDIR@@/munin.conf] +Use EfileE as configuration file. [@@MCONFDIR@@/munin.conf] =item B<< --always-send >> @@ -114,7 +114,7 @@ configuration file contains the necessar =head1 FILES - @@CONFDIR@@/munin.conf + @@MCONFDIR@@/munin.conf @@DBDIR@@/* @@STATEDIR@@/* diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bin/munin-update.in --- munin-2.0.25.orig/master/_bin/munin-update.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/_bin/munin-update.in 2015-09-08 10:13:31.735593251 +0000 @@ -139,7 +139,7 @@ munin-update [options] =item B<< --config_file= >> -Use EfileE as the configuration file. [@@CONFDIR@@/munin.conf] +Use EfileE as the configuration file. [@@MCONFDIR@@/munin.conf] =item B<< --[no]debug >> @@ -192,7 +192,7 @@ and the directories to store them in. =head1 FILES - @@CONFDIR@@/munin.conf + @@MCONFDIR@@/munin.conf @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in --- munin-2.0.25.orig/master/doc/munin.conf.pod.in 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/master/doc/munin.conf.pod.in 2015-09-08 10:13:31.736593251 +0000 @@ -27,7 +27,7 @@ something like: [machine1.your.dom] address localhost -The default location of F is F<@@CONFDIR@@/munin.conf>. +The default location of F is F<@@MCONFDIR@@/munin.conf>. If your placement deviates from this norm, use the "--config EfileE"-option when running the munin-* programs. @@ -149,20 +149,20 @@ is C. Affects: munin-update. =item B This directive sets the location of the private key to be used for -TLS. Default is @@CONFDIR@@/munin.pem. The private key and +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and certificate can be stored in the same file. Affects: munin-update. =item B This directive sets the location of the TLS certificate to be used for -TLS. Default is @@CONFDIR@@/munin.pem. The private key and +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and certificate can be stored in the same file. Affects: munin-update. =item B This directive sets the CA certificate to be used to verify the node's certificate, if tls_verify_certificate is set to C. Default is -@@CONFDIR@@/cacert.pem. Affects: munin-update. +@@MCONFDIR@@/cacert.pem. Affects: munin-update. =item B diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/doc/munin-cron.pod.in --- munin-2.0.25.orig/master/doc/munin-cron.pod.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/doc/munin-cron.pod.in 2015-09-08 10:13:31.736593251 +0000 @@ -22,7 +22,7 @@ Limit hosts to EhostE. Multiple =item B<< --config >> -Use EfileE as configuration file. [F<@@CONFDIR@@/munin.conf>] +Use EfileE as configuration file. [F<@@MCONFDIR@@/munin.conf>] =back diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/master/extras/munin-update_old.in --- munin-2.0.25.orig/master/extras/munin-update_old.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/extras/munin-update_old.in 2015-09-08 10:13:31.736593251 +0000 @@ -43,7 +43,7 @@ my $DEBUG=0; my $STATS; my $cli_do_fork; my $cli_timeout; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; my $config; my $do_fork = 1; my $serversocket = "munin-server-socket.$$"; @@ -159,7 +159,7 @@ Options: --host Limit graphed hosts to . Multiple --host options may be supplied. --config Use as configuration file. - [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf] + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf] --[no]debug View debug messages. [--nodebug] --[no]fork Don't fork one instance for each host. [--fork] --timeout= TCP timeout when talking to clients. [$timeout] @@ -752,11 +752,11 @@ sub run_starttls_if_required { my $ca_cert; my $tls_verify; $key = $cert = munin_get ($config, "tls_pem"); - $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem") + $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem") unless defined $key; - $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem") + $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem") unless defined $cert; - $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem") + $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem") unless defined $ca_cert; $tls_verify=&munin_get ($config, "tls_verify_certificate", "no"); $depth=&munin_get ($config, "tls_verify_depth", 5); @@ -1088,7 +1088,7 @@ Limit fetched data to those from Eho =item B<< --config >> -Use EfileE as configuration file. [@@CONFDIR@@/munin.conf] +Use EfileE as configuration file. [@@MCONFDIR@@/munin.conf] =item B<< --help >> @@ -1124,7 +1124,7 @@ and the directories to store them in. =head1 FILES - @@CONFDIR@@/munin.conf + @@MCONFDIR@@/munin.conf @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm --- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/master/lib/Munin/Master/Config.pm 2015-09-08 10:13:31.737593251 +0000 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw( root_instance => 1, config => bless ( { - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf", + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf", dbdir => $Munin::Common::Defaults::MUNIN_DBDIR, debug => 0, fork => 1, @@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw( rundir => $Munin::Common::Defaults::MUNIN_STATEDIR, timeout => 180, tls => 'disabled', - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem", - tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", - tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", + tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem", + tls_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem", + tls_private_key => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem", tls_verify_certificate => 0, tls_verify_depth => 5, tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR", diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/master/lib/Munin/Master/GraphOld.pm --- munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/lib/Munin/Master/GraphOld.pm 2015-09-08 10:13:31.738593251 +0000 @@ -92,7 +92,7 @@ my $skip_locking = 0; my $skip_stats = 0; my $stdout = 0; my $force_run_as_root = 0; -my $conffile = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf"; +my $conffile = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf"; my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR; # Note: Nothing by default is more convenient and elliminates code while # for cgi graphing - but it breaks how munin-graph expected stuff to work. diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm --- munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm 2015-09-08 10:13:31.738593251 +0000 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy ); my @times = ("day", "week", "month", "year"); my $DEBUG = 0; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; my $do_usage = 0; my $do_version = 0; my $stdout = 0; @@ -859,7 +859,7 @@ Options: --service Compatibility. No effect. --host Compatibility. No effect. --config Use as configuration file. - [/etc/munin/munin.conf] + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf] "; exit 0; @@ -894,7 +894,7 @@ Compatibility. No effect. =item B<< --config >> -Use EfileE as configuration file. [/etc/munin/munin.conf] +Use EfileE as configuration file. [@@MCONFDIR@@/munin.conf] =item B<< --help >> @@ -917,7 +917,7 @@ Munin-html creates the html pages. =head1 FILES - @@CONFDIR@@/munin.conf + @@MCONFDIR@@/munin.conf @@DBDIR@@/datafile @@LOGDIR@@/munin-html @@HTMLDIR@@/* diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm --- munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm 2015-09-08 10:13:31.739593251 +0000 @@ -52,7 +52,7 @@ use Munin::Master::Utils; use Munin::Common::Defaults; my $DEBUG = 0; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; my $do_usage = 0; my $do_version = 0; my @limit_hosts = (); @@ -230,7 +230,7 @@ Options: --contact Limit notified contacts to . Multiple --contact options may be supplied. --config Use as configuration file. - [/etc/munin/munin.conf] + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf] "; exit 0; diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm --- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/master/lib/Munin/Master/Utils.pm 2015-09-08 10:13:31.740593251 +0000 @@ -115,7 +115,7 @@ my $config_parts = { }, }; -my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf"; +my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf"; # Fields to copy when "aliasing" a field my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info"); diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in --- munin-2.0.25.orig/master/munin.conf.in 2015-09-08 10:12:45.000000000 +0000 +++ munin-2.0.25/master/munin.conf.in 2015-09-08 10:13:31.740593251 +0000 @@ -24,7 +24,7 @@ # cgitmpdir @@DBDIR@@/cgi-tmp # (Exactly one) directory to include all files from. -includedir @@CONFDIR@@/munin-conf.d +includedir @@MCONFDIR@@/munin-conf.d # You can choose the time reference for "DERIVE" like graphs, and show # "per minute", "per hour" values instead of the default "per second" diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/t/munin_master_config.t --- munin-2.0.25.orig/master/t/munin_master_config.t 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/t/munin_master_config.t 2015-09-08 10:13:31.741593251 +0000 @@ -24,7 +24,7 @@ my $fasit = { }, config => { - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf", + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf", dbdir => '/opt/munin/sandbox/var/opt/munin', debug => 0, fork => 1, diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/www/munin-htaccess.in --- munin-2.0.25.orig/master/www/munin-htaccess.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/master/www/munin-htaccess.in 2015-09-08 10:13:31.741593251 +0000 @@ -9,7 +9,7 @@ # # -AuthUserFile @@CONFDIR@@/munin-htpasswd +AuthUserFile @@MCONFDIR@@/munin-htpasswd AuthName "Munin" AuthType Basic require valid-user diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc --- munin-2.0.25.orig/node/bin/munindoc 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/bin/munindoc 2015-09-08 10:13:31.742593251 +0000 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin); # Dirs in which to look for $plugin.pod and $plugin files. my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins", - "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins", + "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins", "$Munin::Common::Defaults::MUNIN_PERLLIB"); File::Find::find({wanted => \&wanted_pod}, @DIRS); diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/munin-node.conf.pod --- munin-2.0.25.orig/node/doc/munin-node.conf.pod 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/doc/munin-node.conf.pod 2015-09-08 10:13:31.742593251 +0000 @@ -91,20 +91,20 @@ is C. =item B This directive sets the location of the private key to be used for -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and certificate can be stored in the same file. =item B This directive sets the location of the TLS certificate to be used for -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and certificate can be stored in the same file. =item B This directive sets the CA certificate to be used to verify the node's certificate, if tls_verify_certificate is set to C. Default is -@@CONFDIR@@/cacert.pem. +@@NCONFDIR@@/cacert.pem. =item B diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/extras/munin-node-simple.in --- munin-2.0.25.orig/node/extras/munin-node-simple.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/extras/munin-node-simple.in 2015-09-08 10:13:31.742593251 +0000 @@ -28,8 +28,8 @@ use strict; $| = 1; -my $clientdir = "@@CONFDIR@@/node.d"; -my $conffile = "@@CONFDIR@@/node-simple.conf"; +my $clientdir = "@@NCONFDIR@@/node.d"; +my $conffile = "@@NCONFDIR@@/node-simple.conf"; my $version = "@@VERSION@@"; # Empty environment diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib/Munin/Node/Config.pm --- munin-2.0.25.orig/node/lib/Munin/Node/Config.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/lib/Munin/Node/Config.pm 2015-09-08 10:13:31.743593251 +0000 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw( my ($class) = @_; $instance ||= bless { - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf", + config_file => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf", }, $class; return $instance; diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib/Munin/Node/Server.pm --- munin-2.0.25.orig/node/lib/Munin/Node/Server.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/lib/Munin/Node/Server.pm 2015-09-08 10:13:31.744593251 +0000 @@ -263,11 +263,11 @@ sub _process_starttls_command { my $mode = $session->{tls_mode}; my $key = $config->{tls_private_key} - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem"; + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem"; my $cert = $config->{tls_certificate} - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem"; + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem"; my $ca_cert = $config->{tls_ca_certificate} - || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem"; + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem"; my $tls_verify = $config->{tls_verify_certificate} || 0; my $tls_match = $config->{tls_match}; diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/lib/Munin/Node/Service.pm --- munin-2.0.25.orig/node/lib/Munin/Node/Service.pm 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/lib/Munin/Node/Service.pm 2015-09-08 10:13:31.744593251 +0000 @@ -22,7 +22,7 @@ sub new my ($class, %args) = @_; # Set defaults - $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins"; + $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins"; $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER; $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP; diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-node --- munin-2.0.25.orig/node/sbin/munin-node 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/sbin/munin-node 2015-09-08 10:13:31.745593251 +0000 @@ -36,8 +36,8 @@ use Munin::Node::Service; use Munin::Node::Server; my $servicedir; -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d"; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf"; +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d"; +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf"; my $DEBUG = 0; my $PIDEBUG = 0; my $paranoia = 0; @@ -164,7 +164,7 @@ and returning the output they produce. =item B<< --config >> -Use EfileE as configuration file. [@@CONFDIR@@/munin-node.conf] +Use EfileE as configuration file. [@@NCONFDIR@@/munin-node.conf] =item B< --[no]paranoia > @@ -187,9 +187,9 @@ may enable debugging. [--nopidebug] =head1 FILES - @@CONFDIR@@/munin-node.conf - @@CONFDIR@@/plugins/* - @@CONFDIR@@/plugin-conf.d/* + @@NCONFDIR@@/munin-node.conf + @@NCONFDIR@@/plugins/* + @@NCONFDIR@@/plugin-conf.d/* @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sbin/munin-node-configure --- munin-2.0.25.orig/node/sbin/munin-node-configure 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/sbin/munin-node-configure 2015-09-08 10:13:31.745593251 +0000 @@ -76,9 +76,9 @@ sub main sub parse_args { - my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf"; - my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins"; - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d"; + my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf"; + my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins"; + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d"; my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins"; my $debug = 0; @@ -492,15 +492,15 @@ may enable debugging. =item B<< --config >> -Override configuration file [@@CONFDIR@@/munin-node.conf] +Override configuration file [@@NCONFDIR@@/munin-node.conf] =item B<< --servicedir >> -Override plugin directory [@@CONFDIR@@/plugins/] +Override plugin directory [@@NCONFDIR@@/plugins/] =item B<< --sconfdir >> -Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/] +Override plugin configuration directory [@@NCONFDIR@@/plugin-conf.d/] =item B<< --libdir >> @@ -648,9 +648,9 @@ not this works with any particular devic =head1 FILES - @@CONFDIR@@/munin-node.conf - @@CONFDIR@@/plugin-conf.d/* - @@CONFDIR@@/plugins/* + @@NCONFDIR@@/munin-node.conf + @@NCONFDIR@@/plugin-conf.d/* + @@NCONFDIR@@/plugins/* @@LIBDIR@@/plugins/plugins.history @@LIBDIR@@/plugins/* diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-run --- munin-2.0.25.orig/node/sbin/munin-run 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/sbin/munin-run 2015-09-08 10:13:31.746593251 +0000 @@ -35,7 +35,7 @@ use Munin::Node::Service; my $services; my $servicedir; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf"; +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf"; my $DEBUG = 0; my $PIDEBUG = 0; my $paranoia = 0; @@ -98,7 +98,7 @@ sub main sub parse_args { # Default configuration values - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d"; + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d"; my $sconffile; my ($plugin, $arg); @@ -189,15 +189,15 @@ as they are under munin-node. =item B<< --config >> -Use EfileE as configuration file. [@@CONFDIR@@/munin-node.conf] +Use EfileE as configuration file. [@@NCONFDIR@@/munin-node.conf] =item B<< --servicedir >> -Use EdirE as plugin dir. [@@CONFDIR@@/plugins/] +Use EdirE as plugin dir. [@@NCONFDIR@@/plugins/] =item B<< --sconfdir >> -Use EdirE as plugin configuration dir. [@@CONFDIR@@/plugin-conf.d/] +Use EdirE as plugin configuration dir. [@@NCONFDIR@@/plugin-conf.d/] =item B<< --sconffile >> @@ -230,9 +230,9 @@ Show version information. =head1 FILES - @@CONFDIR@@/munin-node.conf - @@CONFDIR@@/plugins/* - @@CONFDIR@@/plugin-conf.d/* + @@NCONFDIR@@/munin-node.conf + @@NCONFDIR@@/plugins/* + @@NCONFDIR@@/plugin-conf.d/* @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-sched --- munin-2.0.25.orig/node/sbin/munin-sched 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/node/sbin/munin-sched 2015-09-08 10:13:31.747593251 +0000 @@ -34,8 +34,8 @@ use Munin::Node::Config; use Munin::Node::ProxySpooler; my $servicedir; -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d"; -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf"; +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d"; +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf"; my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR; my ($host, $port); @@ -164,7 +164,7 @@ and returning the output they produce. =item B<< --config >> -Use EfileE as configuration file. [@@CONFDIR@@/munin-node.conf] +Use EfileE as configuration file. [@@NCONFDIR@@/munin-node.conf] =item B< --[no]paranoia > @@ -182,9 +182,9 @@ View debug messages. This can be very v =head1 FILES - @@CONFDIR@@/munin-node.conf - @@CONFDIR@@/plugins/* - @@CONFDIR@@/plugin-conf.d/* + @@NCONFDIR@@/munin-node.conf + @@NCONFDIR@@/plugins/* + @@NCONFDIR@@/plugin-conf.d/* @@STATEDIR@@/munin-sched.pid @@LOGDIR@@/munin-sched.log diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugins/node.d/exim_mailqueue.in --- munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/exim_mailqueue.in 2015-09-08 10:13:31.747593251 +0000 @@ -15,7 +15,7 @@ examine the queue directories. This is [exim_*] user exim -Configuration parameters for a file in @@CONFDIR@@/plugin-conf.d/ +Configuration parameters for a file in @@NCONFDIR@@/plugin-conf.d/ if you need to override the defaults below: [exim_mailqueue] diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins/node.d/ipmi_sensor_.in --- munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/ipmi_sensor_.in 2015-09-08 10:13:31.747593251 +0000 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra ipmitool probably needs to be run as root, and it may take more than 10 seconds on some hosts. -Add the following to your @@CONFDIR@@/munin-node: +Add the following to your @@NCONFDIR@@/munin-node: [ipmi_sensor_*] user root @@ -49,7 +49,7 @@ with this program; if not, write to the =head1 BUGS -Plugin reads @@CONFDIR@@/ipmi directly, instead of reading environment +Plugin reads @@NCONFDIR@@/ipmi directly, instead of reading environment variables. =head1 MAGIC MARKERS @@ -72,7 +72,7 @@ import re CACHEDIR = environ['MUNIN_PLUGSTATE'] CACHEFILE = "plugin-ipmi_sensor.cache" CACHEAGE = 120 -CONFIG = '@@CONFDIR@@/ipmi' +CONFIG = '@@NCONFDIR@@/ipmi' diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in --- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in 2015-09-08 10:05:48.000000000 +0000 +++ munin-2.0.25/plugins/node.d/mysql_innodb.in 2015-09-08 10:13:31.748593251 +0000 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo =head1 CONFIGURATION -Configuration parameters for @@CONFDIR@@/mysql_innodb, +Configuration parameters for @@NCONFDIR@@/mysql_innodb, if you need to override the defaults below: [mysql_innodb] diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/plugins/node.d/mysql_isam_space_.in --- munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/mysql_isam_space_.in 2015-09-08 10:13:31.748593251 +0000 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser =head1 CONFIGURATION -Configuration parameters for @@CONFDIR@@/PLUGIN, +Configuration parameters for @@NCONFDIR@@/PLUGIN, if you need to override the defaults below: [mysql_isam_space_*] diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in --- munin-2.0.25.orig/plugins/node.d/mysql_threads.in 2015-09-08 10:05:48.000000000 +0000 +++ munin-2.0.25/plugins/node.d/mysql_threads.in 2015-09-08 10:13:31.748593251 +0000 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu =head1 CONFIGURATION -Configuration parameters for @@CONFDIR@@/mysql_threads, if you +Configuration parameters for @@NCONFDIR@@/mysql_threads, if you need to override the defaults below: [mysql_threads] diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d/named.in --- munin-2.0.25.orig/plugins/node.d/named.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/named.in 2015-09-08 10:13:31.749593251 +0000 @@ -34,7 +34,7 @@ restrictions on the log file. =head1 CONFIGURATION -Configuration parameters for @@CONFDIR@@/named, +Configuration parameters for @@NCONFDIR@@/named, if you need to override the defaults below: [named] diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in --- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:05:48.000000000 +0000 +++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:13:31.749593251 +0000 @@ -12,7 +12,7 @@ the NTP status No configuration -This plugin optionally reads the file @@CONFDIR@@/ntp-freq-comp, which +This plugin optionally reads the file @@NCONFDIR@@/ntp-freq-comp, which should contain a number to be added to the frequency read by ntpdc. =head1 AUTHORS @@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then exit 0 fi -if [ -f @@CONFDIR@@/ntp-freq-comp ]; then - fcomp=`cat @@CONFDIR@@/ntp-freq-comp` +if [ -f @@NCONFDIR@@/ntp-freq-comp ]; then + fcomp=`cat @@NCONFDIR@@/ntp-freq-comp` else fcomp=0 fi diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/plugins/node.d/postfix_mailstats.in --- munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/postfix_mailstats.in 2015-09-08 10:13:31.749593251 +0000 @@ -8,7 +8,7 @@ rejected by postfix =head1 CONFIGURATION -Configuration parameters for @@CONFDIR@@/postfix_mailstats, +Configuration parameters for @@NCONFDIR@@/postfix_mailstats, if you need to override the defaults below: [postfix_mailstats] diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/psu_.in --- munin-2.0.25.orig/plugins/node.d/psu_.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/psu_.in 2015-09-08 10:13:31.750593251 +0000 @@ -15,7 +15,7 @@ we wish to graph. Example: - ln -s @@LIBDIR@@/plugins/psu_ @@CONFDIR@@/plugins/psu_foo + ln -s @@LIBDIR@@/plugins/psu_ @@NCONFDIR@@/plugins/psu_foo ...will monitor the user "foo" diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/node.d/squeezebox_.in --- munin-2.0.25.orig/plugins/node.d/squeezebox_.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/squeezebox_.in 2015-09-08 10:13:31.750593251 +0000 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from non-default configuration, please use the environment variables 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your nc(1) binary is not called "nc", or not the one in $PATH, please define it -in the plugin's environment file (@@CONFDIR@@/squeezebox or similar). +in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar). Sample follows: diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/node.d/varnish_.in --- munin-2.0.25.orig/plugins/node.d/varnish_.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d/varnish_.in 2015-09-08 10:13:31.750593251 +0000 @@ -54,7 +54,7 @@ session, session_herd You can link them yourself with something like this: ln -s @@LIBDIR@@/plugins/varnish_ \ - @@CONFDIR@@/plugins/varnish_data_structures + @@NCONFDIR@@/plugins/varnish_data_structures =head1 INTERPRETATION diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/node.d.cygwin/df.in --- munin-2.0.25.orig/plugins/node.d.cygwin/df.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.cygwin/df.in 2015-09-08 10:13:31.751593251 +0000 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. The plugin excludes per default the following special, read-only or dynamically allocating file systems from graphing: diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/node.d.debug/if.in --- munin-2.0.25.orig/plugins/node.d.debug/if.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.debug/if.in 2015-09-08 10:13:31.751593251 +0000 @@ -21,7 +21,7 @@ variable. For example: =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 MAGIC MARKERS diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/node.d.debug/tc.in --- munin-2.0.25.orig/plugins/node.d.debug/tc.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.debug/tc.in 2015-09-08 10:13:31.751593251 +0000 @@ -21,7 +21,7 @@ For example: =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 MAGIC MARKERS diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/node.d.linux/acpi.in --- munin-2.0.25.orig/plugins/node.d.linux/acpi.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/acpi.in 2015-09-08 10:13:31.751593251 +0000 @@ -17,7 +17,7 @@ Load the 'thermal_zone' kernel module an =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 INTERPRETATION diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/node.d.linux/apt.in --- munin-2.0.25.orig/plugins/node.d.linux/apt.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/apt.in 2015-09-08 10:13:31.752593251 +0000 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob =head1 USAGE -Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 NOTES diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/node.d.linux/df.in --- munin-2.0.25.orig/plugins/node.d.linux/df.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/df.in 2015-09-08 10:13:31.752593251 +0000 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl env.warning 92 env.critical 98 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node. +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node. You may specify filesystem specific warning and critical levels: @@ -55,7 +55,7 @@ RE will not be included. =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 MAGIC MARKERS diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugins/node.d.linux/df_inode.in --- munin-2.0.25.orig/plugins/node.d.linux/df_inode.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/df_inode.in 2015-09-08 10:13:31.752593251 +0000 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl env.warning 92 env.critical 98 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node. +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node. You may specify filesystem specific warning and critical levels: @@ -55,7 +55,7 @@ RE will not be included. =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 MAGIC MARKERS diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/plugins/node.d.linux/fw_conntrack.in --- munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/fw_conntrack.in 2015-09-08 10:13:31.753593251 +0000 @@ -11,7 +11,7 @@ This plugin must run with root privilege =head2 CONFIGURATION EXAMPLE -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain: +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain: [fw_*] user root diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in --- munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in 2015-09-08 10:13:31.753593251 +0000 @@ -10,7 +10,7 @@ This plugin must run with root privilege =head2 CONFIGURATION EXAMPLE -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain: +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain: [fw_*] user root diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plugins/node.d.linux/fw_packets.in --- munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/fw_packets.in 2015-09-08 10:13:31.754593251 +0000 @@ -11,7 +11,7 @@ This plugin must run with root privilege =head1 CONFIGURATION EXAMPLE -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain: +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain: [fw*] user root diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in --- munin-2.0.25.orig/plugins/node.d.linux/iostat.in 2015-09-08 10:05:55.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/iostat.in 2015-09-08 10:13:31.754593251 +0000 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in. =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 INTERPRETATION diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plugins/node.d.linux/iostat_ios.in --- munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/iostat_ios.in 2015-09-08 10:13:31.754593251 +0000 @@ -15,7 +15,7 @@ None needed =head1 USAGE -Link this into @@CONFDIR@@/plugins/ and restart the munin-node. +Link this into @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 INTERPRETATION diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugins/node.d.linux/irqstats.in --- munin-2.0.25.orig/plugins/node.d.linux/irqstats.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/plugins/node.d.linux/irqstats.in 2015-09-08 10:13:31.754593251 +0000 @@ -15,7 +15,7 @@ None needed =head1 USAGE -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node. +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node. =head1 INTERPRETATION diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/resources/hpux-init.d_munin-node.in --- munin-2.0.25.orig/resources/hpux-init.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/resources/hpux-init.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000 @@ -6,7 +6,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin NAME=munin-node DAEMON=@@SBINDIR@@/$NAME -CONFFILE=@@CONFDIR@@/munin-node.conf +CONFFILE=@@NCONFDIR@@/munin-node.conf RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE) PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE) MYCONF=/etc/rc.config.d/muninconf diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/resources/linux-cron.d_munin-node.in --- munin-2.0.25.orig/resources/linux-cron.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/resources/linux-cron.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000 @@ -8,5 +8,5 @@ MAILTO=root # an hour (12 invokations an hour, 1 in 12 chance that the update will # happen), but ensure that there will never be more than two hour (7200 # seconds) interval between updates.. -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null diff -urNp munin-2.0.25.orig/t/Makefile.config munin-2.0.25/t/Makefile.config --- munin-2.0.25.orig/t/Makefile.config 2014-11-24 21:46:24.000000000 +0000 +++ munin-2.0.25/t/Makefile.config 2015-09-08 10:13:31.755593251 +0000 @@ -9,7 +9,8 @@ PREFIX = $(PWD)/t/install # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(PREFIX)/etc +MCONFDIR = $(PREFIX)/etc +NCONFDIR = $(PREFIX)/etc # Client only - Where to put RRD files and other intenal data DBDIR = $(PREFIX)/var/lib