1 diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm
2 --- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:12:45.000000000 +0000
3 +++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:13:31.731593251 +0000
4 @@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
5 our $DROPDOWNLIMIT = 1;
7 our $MUNIN_PREFIX = '';
8 -our $MUNIN_CONFDIR = "$COMPONENT_ROOT/t/config/";
9 +our $MUNIN_MCONFDIR = "$COMPONENT_ROOT/t/config/";
10 +our $MUNIN_NCONFDIR = "$COMPONENT_ROOT/t/config/";
11 our $MUNIN_BINDIR = '';
12 our $MUNIN_SBINDIR = '';
13 our $MUNIN_DOCDIR = '';
14 diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc/installation/configuration.rst
15 --- munin-2.0.25.orig/doc/installation/configuration.rst 2014-11-24 21:46:24.000000000 +0000
16 +++ munin-2.0.25/doc/installation/configuration.rst 2015-09-08 10:13:31.732593251 +0000
17 @@ -9,7 +9,7 @@ Plugins
20 Decide which plugins to use. The munin node runs all plugins present
24 The quick auto-plug-and-play solution:
26 @@ -59,7 +59,7 @@ Master
30 -Add some nodes to CONFDIR/munin.conf
31 +Add some nodes to MCONFDIR/munin.conf
35 diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
36 --- munin-2.0.25.orig/Makefile 2015-09-08 10:12:45.000000000 +0000
37 +++ munin-2.0.25/Makefile 2015-09-08 10:13:31.733593251 +0000
38 @@ -56,7 +56,7 @@ uninstall:
39 # a new config. Target _only_ suitable for maintainers.
41 rm -f $(HTMLDIR)/.htaccess
42 - rm -f $(CONFDIR)/munin.conf
43 + rm -f $(MCONFDIR)/munin.conf
47 @@ -71,14 +71,15 @@ install-pre: Makefile Makefile.config
52 + mkdir -p $(NCONFDIR)
53 + mkdir -p $(MCONFDIR)
54 $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
56 install-master-prime: $(INFILES_MASTER) install-pre install-master
57 mkdir -p $(TEMPLATEDIR)
58 mkdir -p $(TEMPLATEDIR)/static
59 mkdir -p $(TEMPLATEDIR)/partial
60 - mkdir -p $(CONFDIR)/munin-conf.d
61 + mkdir -p $(MCONFDIR)/munin-conf.d
65 @@ -111,7 +112,7 @@ install-master-prime: $(INFILES_MASTER)
66 $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
68 test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
69 - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
70 + test -f "$(MCONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(MCONFDIR)/
72 $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
73 $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
74 @@ -140,14 +141,14 @@ endif
75 install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
78 - mkdir -p $(CONFDIR)/plugins
79 - mkdir -p $(CONFDIR)/plugin-conf.d
80 + mkdir -p $(NCONFDIR)/plugins
81 + mkdir -p $(NCONFDIR)/plugin-conf.d
82 mkdir -p $(LIBDIR)/plugins
85 $(CHOWN) root:root $(PLUGSTATE)
86 $(CHMOD) 0755 $(PLUGSTATE)
87 - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
88 + $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d
90 for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
91 if test -f "$$p" ; then \
92 @@ -184,7 +185,7 @@ install-async:
93 install-node-prime: install-node-pre install-node
95 install-node-pre: build/node/munin-node.conf install-pre
96 - test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
97 + test -f "$(NCONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(NCONFDIR)/
100 install-common-prime: build-common install-common
101 @@ -220,7 +221,8 @@ build/%: %.in
103 @mkdir -p build/`dirname $<`
104 @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
105 - -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
106 + -e 's|@@MCONFDIR@@|$(MCONFDIR)|g' \
107 + -e 's|@@NCONFDIR@@|$(NCONFDIR)|g' \
108 -e 's|@@BINDIR@@|$(BINDIR)|g' \
109 -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
110 -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
111 @@ -301,7 +303,8 @@ build-common-pre: common/Build
112 common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
113 rm -f common/blib/lib/Munin/Common/Defaults.pm
114 $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \
115 - s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \
116 + s{(MCONFDIR \s+=\s).*}{\1q{$(MCONFDIR)};}x; \
117 + s{(NCONFDIR \s+=\s).*}{\1q{$(NCONFDIR)};}x; \
118 s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \
119 s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \
120 s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \
121 @@ -428,7 +431,7 @@ old-test: t/*.t
122 $(MAKE) $@ CONFIG=t/Makefile.config
124 test_plugins = id_default id_root env
125 -old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
126 +old-test: t/*.t t/install $(addprefix $(NCONFDIR)/plugins/,$(test_plugins))
127 @for test in t/*.t; do \
128 echo -n "$$test: "; \
129 PERL5LIB=$(PERLLIB) $(PERL) $$test;\
130 @@ -436,10 +439,10 @@ old-test: t/*.t t/install $(addprefix $(
133 node-monkeywrench: install-node
134 - rm -rf $(CONFDIR)/plugins
135 + rm -rf $(NCONFDIR)/plugins
136 rm -rf $(LIBDIR)/plugins
137 mkdir -p $(LIBDIR)/plugins
138 - mkdir -p $(CONFDIR)/plugins
139 + mkdir -p $(NCONFDIR)/plugins
140 cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
141 $(SBINDIR)/munin-node-configure --suggest
143 diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
144 --- munin-2.0.25.orig/Makefile.config 2015-09-08 10:12:45.000000000 +0000
145 +++ munin-2.0.25/Makefile.config 2015-09-08 10:13:31.733593251 +0000
147 PREFIX = $(DESTDIR)/usr
149 # Where Munin keeps its configurations (server.conf, client.conf, ++)
150 -CONFDIR = $(DESTDIR)/etc/munin
151 +NCONFDIR = $(DESTDIR)/etc/munin
152 +MCONFDIR = $(DESTDIR)/etc/webapps/munin
154 # Server only - where to put munin-cron
155 BINDIR = $(PREFIX)/bin
156 diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/_bin/munin-cgi-graph.in
157 --- munin-2.0.25.orig/master/_bin/munin-cgi-graph.in 2014-11-24 21:46:24.000000000 +0000
158 +++ munin-2.0.25/master/_bin/munin-cgi-graph.in 2015-09-08 10:13:31.734593251 +0000
159 @@ -44,7 +44,7 @@ use Munin::Master::Logger;
160 use Log::Log4perl qw( :easy );
162 my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
163 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
164 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
166 my %period = ( "day" => 300,
168 diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin/munin-check.in
169 --- munin-2.0.25.orig/master/_bin/munin-check.in 2014-11-24 21:46:24.000000000 +0000
170 +++ munin-2.0.25/master/_bin/munin-check.in 2015-09-08 10:13:31.734593251 +0000
171 @@ -163,7 +163,7 @@ done
172 norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
173 norec=yes perm_ok @@PLUGSTATE@@ 775
175 -norec=yes perm_ok @@CONFDIR@@/plugin-conf.d 755
176 +norec=yes perm_ok @@NCONFDIR@@/plugin-conf.d 755
178 echo "Check done. Please note that this script only checks most things,"
179 echo "not all things."
180 diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin/munin-graph.in
181 --- munin-2.0.25.orig/master/_bin/munin-graph.in 2014-11-24 21:46:24.000000000 +0000
182 +++ munin-2.0.25/master/_bin/munin-graph.in 2015-09-08 10:13:31.735593251 +0000
183 @@ -51,7 +51,7 @@ use Munin::Master::Logger;
184 use Log::Log4perl qw( :easy );
186 my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
187 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
188 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
190 my %period = ( "day" => 300,
192 diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bin/munin-limits.in
193 --- munin-2.0.25.orig/master/_bin/munin-limits.in 2014-11-24 21:46:24.000000000 +0000
194 +++ munin-2.0.25/master/_bin/munin-limits.in 2015-09-08 10:13:31.735593251 +0000
195 @@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
197 =item B<< --config <file> >>
199 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
200 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
202 =item B<< --always-send <severity list> >>
204 @@ -114,7 +114,7 @@ configuration file contains the necessar
208 - @@CONFDIR@@/munin.conf
209 + @@MCONFDIR@@/munin.conf
213 diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bin/munin-update.in
214 --- munin-2.0.25.orig/master/_bin/munin-update.in 2014-11-24 21:46:24.000000000 +0000
215 +++ munin-2.0.25/master/_bin/munin-update.in 2015-09-08 10:13:31.735593251 +0000
216 @@ -139,7 +139,7 @@ munin-update [options]
218 =item B<< --config_file=<file> >>
220 -Use E<lt>fileE<gt> as the configuration file. [@@CONFDIR@@/munin.conf]
221 +Use E<lt>fileE<gt> as the configuration file. [@@MCONFDIR@@/munin.conf]
223 =item B<< --[no]debug >>
225 @@ -192,7 +192,7 @@ and the directories to store them in.
229 - @@CONFDIR@@/munin.conf
230 + @@MCONFDIR@@/munin.conf
232 @@LOGDIR@@/munin-update
234 diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in
235 --- munin-2.0.25.orig/master/doc/munin.conf.pod.in 2015-09-08 10:12:45.000000000 +0000
236 +++ munin-2.0.25/master/doc/munin.conf.pod.in 2015-09-08 10:13:31.736593251 +0000
237 @@ -27,7 +27,7 @@ something like:
241 -The default location of F<munin.conf> is F<@@CONFDIR@@/munin.conf>.
242 +The default location of F<munin.conf> is F<@@MCONFDIR@@/munin.conf>.
243 If your placement deviates from this norm, use the "--config
244 E<lt>fileE<gt>"-option when running the munin-* programs.
246 @@ -149,20 +149,20 @@ is C<no>. Affects: munin-update.
247 =item B<tls_private_key> <value>
249 This directive sets the location of the private key to be used for
250 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
251 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
252 certificate can be stored in the same file. Affects: munin-update.
254 =item B<tls_certificate> <value>
256 This directive sets the location of the TLS certificate to be used for
257 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
258 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
259 certificate can be stored in the same file. Affects: munin-update.
261 =item B<tls_ca_certificate> <value>
263 This directive sets the CA certificate to be used to verify the node's
264 certificate, if tls_verify_certificate is set to C<yes>. Default is
265 -@@CONFDIR@@/cacert.pem. Affects: munin-update.
266 +@@MCONFDIR@@/cacert.pem. Affects: munin-update.
268 =item B<tls_verify_depth> <value>
270 diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/doc/munin-cron.pod.in
271 --- munin-2.0.25.orig/master/doc/munin-cron.pod.in 2014-11-24 21:46:24.000000000 +0000
272 +++ munin-2.0.25/master/doc/munin-cron.pod.in 2015-09-08 10:13:31.736593251 +0000
273 @@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
275 =item B<< --config <file> >>
277 -Use E<lt>fileE<gt> as configuration file. [F<@@CONFDIR@@/munin.conf>]
278 +Use E<lt>fileE<gt> as configuration file. [F<@@MCONFDIR@@/munin.conf>]
282 diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/master/extras/munin-update_old.in
283 --- munin-2.0.25.orig/master/extras/munin-update_old.in 2014-11-24 21:46:24.000000000 +0000
284 +++ munin-2.0.25/master/extras/munin-update_old.in 2015-09-08 10:13:31.736593251 +0000
285 @@ -43,7 +43,7 @@ my $DEBUG=0;
289 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
290 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
293 my $serversocket = "munin-server-socket.$$";
294 @@ -159,7 +159,7 @@ Options:
295 --host <host> Limit graphed hosts to <host>. Multiple --host options
297 --config <file> Use <file> as configuration file.
298 - [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf]
299 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
300 --[no]debug View debug messages. [--nodebug]
301 --[no]fork Don't fork one instance for each host. [--fork]
302 --timeout=<seconds> TCP timeout when talking to clients. [$timeout]
303 @@ -752,11 +752,11 @@ sub run_starttls_if_required {
306 $key = $cert = munin_get ($config, "tls_pem");
307 - $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
308 + $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
310 - $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
311 + $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
312 unless defined $cert;
313 - $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem")
314 + $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem")
315 unless defined $ca_cert;
316 $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
317 $depth=&munin_get ($config, "tls_verify_depth", 5);
318 @@ -1088,7 +1088,7 @@ Limit fetched data to those from E<lt>ho
320 =item B<< --config <file> >>
322 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
323 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
327 @@ -1124,7 +1124,7 @@ and the directories to store them in.
331 - @@CONFDIR@@/munin.conf
332 + @@MCONFDIR@@/munin.conf
334 @@LOGDIR@@/munin-update
336 diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm
337 --- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm 2015-09-08 10:12:45.000000000 +0000
338 +++ munin-2.0.25/master/lib/Munin/Master/Config.pm 2015-09-08 10:13:31.737593251 +0000
339 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
343 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
344 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
345 dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
348 @@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw(
349 rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
352 - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
353 - tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
354 - tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
355 + tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem",
356 + tls_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
357 + tls_private_key => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
358 tls_verify_certificate => 0,
359 tls_verify_depth => 5,
360 tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
361 diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/master/lib/Munin/Master/GraphOld.pm
362 --- munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm 2014-11-24 21:46:24.000000000 +0000
363 +++ munin-2.0.25/master/lib/Munin/Master/GraphOld.pm 2015-09-08 10:13:31.738593251 +0000
364 @@ -92,7 +92,7 @@ my $skip_locking = 0;
367 my $force_run_as_root = 0;
368 -my $conffile = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf";
369 +my $conffile = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf";
370 my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR;
371 # Note: Nothing by default is more convenient and elliminates code while
372 # for cgi graphing - but it breaks how munin-graph expected stuff to work.
373 diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm
374 --- munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm 2014-11-24 21:46:24.000000000 +0000
375 +++ munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm 2015-09-08 10:13:31.738593251 +0000
376 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
377 my @times = ("day", "week", "month", "year");
380 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
381 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
385 @@ -859,7 +859,7 @@ Options:
386 --service <service> Compatibility. No effect.
387 --host <host> Compatibility. No effect.
388 --config <file> Use <file> as configuration file.
389 - [/etc/munin/munin.conf]
390 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
394 @@ -894,7 +894,7 @@ Compatibility. No effect.
396 =item B<< --config <file> >>
398 -Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf]
399 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
403 @@ -917,7 +917,7 @@ Munin-html creates the html pages.
407 - @@CONFDIR@@/munin.conf
408 + @@MCONFDIR@@/munin.conf
410 @@LOGDIR@@/munin-html
412 diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm
413 --- munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm 2014-11-24 21:46:24.000000000 +0000
414 +++ munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm 2015-09-08 10:13:31.739593251 +0000
415 @@ -52,7 +52,7 @@ use Munin::Master::Utils;
416 use Munin::Common::Defaults;
419 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
420 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
423 my @limit_hosts = ();
424 @@ -230,7 +230,7 @@ Options:
425 --contact <contact> Limit notified contacts to <contact>. Multiple
426 --contact options may be supplied.
427 --config <file> Use <file> as configuration file.
428 - [/etc/munin/munin.conf]
429 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
433 diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm
434 --- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.000000000 +0000
435 +++ munin-2.0.25/master/lib/Munin/Master/Utils.pm 2015-09-08 10:13:31.740593251 +0000
436 @@ -115,7 +115,7 @@ my $config_parts = {
440 -my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
441 +my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
443 # Fields to copy when "aliasing" a field
444 my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info");
445 diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in
446 --- munin-2.0.25.orig/master/munin.conf.in 2015-09-08 10:12:45.000000000 +0000
447 +++ munin-2.0.25/master/munin.conf.in 2015-09-08 10:13:31.740593251 +0000
449 # cgitmpdir @@DBDIR@@/cgi-tmp
451 # (Exactly one) directory to include all files from.
452 -includedir @@CONFDIR@@/munin-conf.d
453 +includedir @@MCONFDIR@@/munin-conf.d
455 # You can choose the time reference for "DERIVE" like graphs, and show
456 # "per minute", "per hour" values instead of the default "per second"
457 diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/t/munin_master_config.t
458 --- munin-2.0.25.orig/master/t/munin_master_config.t 2014-11-24 21:46:24.000000000 +0000
459 +++ munin-2.0.25/master/t/munin_master_config.t 2015-09-08 10:13:31.741593251 +0000
460 @@ -24,7 +24,7 @@ my $fasit = {
464 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
465 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
466 dbdir => '/opt/munin/sandbox/var/opt/munin',
469 diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/www/munin-htaccess.in
470 --- munin-2.0.25.orig/master/www/munin-htaccess.in 2014-11-24 21:46:24.000000000 +0000
471 +++ munin-2.0.25/master/www/munin-htaccess.in 2015-09-08 10:13:31.741593251 +0000
474 # <directory @@HTMLDIR@@>
476 -AuthUserFile @@CONFDIR@@/munin-htpasswd
477 +AuthUserFile @@MCONFDIR@@/munin-htpasswd
481 diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc
482 --- munin-2.0.25.orig/node/bin/munindoc 2014-11-24 21:46:24.000000000 +0000
483 +++ munin-2.0.25/node/bin/munindoc 2015-09-08 10:13:31.742593251 +0000
484 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
486 # Dirs in which to look for $plugin.pod and $plugin files.
487 my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
488 - "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins",
489 + "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins",
490 "$Munin::Common::Defaults::MUNIN_PERLLIB");
492 File::Find::find({wanted => \&wanted_pod}, @DIRS);
493 diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/munin-node.conf.pod
494 --- munin-2.0.25.orig/node/doc/munin-node.conf.pod 2014-11-24 21:46:24.000000000 +0000
495 +++ munin-2.0.25/node/doc/munin-node.conf.pod 2015-09-08 10:13:31.742593251 +0000
496 @@ -91,20 +91,20 @@ is C<no>.
497 =item B<tls_private_key> <value>
499 This directive sets the location of the private key to be used for
500 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
501 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
502 certificate can be stored in the same file.
504 =item B<tls_certificate> <value>
506 This directive sets the location of the TLS certificate to be used for
507 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
508 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
509 certificate can be stored in the same file.
511 =item B<tls_ca_certificate> <value>
513 This directive sets the CA certificate to be used to verify the node's
514 certificate, if tls_verify_certificate is set to C<yes>. Default is
515 -@@CONFDIR@@/cacert.pem.
516 +@@NCONFDIR@@/cacert.pem.
518 =item B<tls_verify_depth> <value>
520 diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/extras/munin-node-simple.in
521 --- munin-2.0.25.orig/node/extras/munin-node-simple.in 2014-11-24 21:46:24.000000000 +0000
522 +++ munin-2.0.25/node/extras/munin-node-simple.in 2015-09-08 10:13:31.742593251 +0000
523 @@ -28,8 +28,8 @@ use strict;
527 -my $clientdir = "@@CONFDIR@@/node.d";
528 -my $conffile = "@@CONFDIR@@/node-simple.conf";
529 +my $clientdir = "@@NCONFDIR@@/node.d";
530 +my $conffile = "@@NCONFDIR@@/node-simple.conf";
531 my $version = "@@VERSION@@";
534 diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib/Munin/Node/Config.pm
535 --- munin-2.0.25.orig/node/lib/Munin/Node/Config.pm 2014-11-24 21:46:24.000000000 +0000
536 +++ munin-2.0.25/node/lib/Munin/Node/Config.pm 2015-09-08 10:13:31.743593251 +0000
537 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
540 $instance ||= bless {
541 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf",
542 + config_file => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf",
546 diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib/Munin/Node/Server.pm
547 --- munin-2.0.25.orig/node/lib/Munin/Node/Server.pm 2014-11-24 21:46:24.000000000 +0000
548 +++ munin-2.0.25/node/lib/Munin/Node/Server.pm 2015-09-08 10:13:31.744593251 +0000
549 @@ -263,11 +263,11 @@ sub _process_starttls_command {
550 my $mode = $session->{tls_mode};
552 my $key = $config->{tls_private_key}
553 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
554 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
555 my $cert = $config->{tls_certificate}
556 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
557 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
558 my $ca_cert = $config->{tls_ca_certificate}
559 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem";
560 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem";
561 my $tls_verify = $config->{tls_verify_certificate}
563 my $tls_match = $config->{tls_match};
564 diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/lib/Munin/Node/Service.pm
565 --- munin-2.0.25.orig/node/lib/Munin/Node/Service.pm 2014-11-24 21:46:24.000000000 +0000
566 +++ munin-2.0.25/node/lib/Munin/Node/Service.pm 2015-09-08 10:13:31.744593251 +0000
567 @@ -22,7 +22,7 @@ sub new
568 my ($class, %args) = @_;
571 - $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
572 + $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
574 $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
575 $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
576 diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-node
577 --- munin-2.0.25.orig/node/sbin/munin-node 2014-11-24 21:46:24.000000000 +0000
578 +++ munin-2.0.25/node/sbin/munin-node 2015-09-08 10:13:31.745593251 +0000
579 @@ -36,8 +36,8 @@ use Munin::Node::Service;
580 use Munin::Node::Server;
583 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
584 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
585 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
586 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
590 @@ -164,7 +164,7 @@ and returning the output they produce.
592 =item B<< --config <configfile> >>
594 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
595 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
597 =item B< --[no]paranoia >
599 @@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
603 - @@CONFDIR@@/munin-node.conf
604 - @@CONFDIR@@/plugins/*
605 - @@CONFDIR@@/plugin-conf.d/*
606 + @@NCONFDIR@@/munin-node.conf
607 + @@NCONFDIR@@/plugins/*
608 + @@NCONFDIR@@/plugin-conf.d/*
609 @@STATEDIR@@/munin-node.pid
610 @@LOGDIR@@/munin-node.log
612 diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sbin/munin-node-configure
613 --- munin-2.0.25.orig/node/sbin/munin-node-configure 2014-11-24 21:46:24.000000000 +0000
614 +++ munin-2.0.25/node/sbin/munin-node-configure 2015-09-08 10:13:31.745593251 +0000
615 @@ -76,9 +76,9 @@ sub main
619 - my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
620 - my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
621 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
622 + my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
623 + my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
624 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
625 my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
628 @@ -492,15 +492,15 @@ may enable debugging.
630 =item B<< --config <file> >>
632 -Override configuration file [@@CONFDIR@@/munin-node.conf]
633 +Override configuration file [@@NCONFDIR@@/munin-node.conf]
635 =item B<< --servicedir <dir> >>
637 -Override plugin directory [@@CONFDIR@@/plugins/]
638 +Override plugin directory [@@NCONFDIR@@/plugins/]
640 =item B<< --sconfdir <dir> >>
642 -Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]
643 +Override plugin configuration directory [@@NCONFDIR@@/plugin-conf.d/]
645 =item B<< --libdir <dir> >>
647 @@ -648,9 +648,9 @@ not this works with any particular devic
651 - @@CONFDIR@@/munin-node.conf
652 - @@CONFDIR@@/plugin-conf.d/*
653 - @@CONFDIR@@/plugins/*
654 + @@NCONFDIR@@/munin-node.conf
655 + @@NCONFDIR@@/plugin-conf.d/*
656 + @@NCONFDIR@@/plugins/*
657 @@LIBDIR@@/plugins/plugins.history
660 diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-run
661 --- munin-2.0.25.orig/node/sbin/munin-run 2014-11-24 21:46:24.000000000 +0000
662 +++ munin-2.0.25/node/sbin/munin-run 2015-09-08 10:13:31.746593251 +0000
663 @@ -35,7 +35,7 @@ use Munin::Node::Service;
667 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
668 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
672 @@ -98,7 +98,7 @@ sub main
675 # Default configuration values
676 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
677 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
681 @@ -189,15 +189,15 @@ as they are under munin-node.
683 =item B<< --config <configfile> >>
685 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
686 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
688 =item B<< --servicedir <dir> >>
690 -Use E<lt>dirE<gt> as plugin dir. [@@CONFDIR@@/plugins/]
691 +Use E<lt>dirE<gt> as plugin dir. [@@NCONFDIR@@/plugins/]
693 =item B<< --sconfdir <dir> >>
695 -Use E<lt>dirE<gt> as plugin configuration dir. [@@CONFDIR@@/plugin-conf.d/]
696 +Use E<lt>dirE<gt> as plugin configuration dir. [@@NCONFDIR@@/plugin-conf.d/]
698 =item B<< --sconffile <file> >>
700 @@ -230,9 +230,9 @@ Show version information.
704 - @@CONFDIR@@/munin-node.conf
705 - @@CONFDIR@@/plugins/*
706 - @@CONFDIR@@/plugin-conf.d/*
707 + @@NCONFDIR@@/munin-node.conf
708 + @@NCONFDIR@@/plugins/*
709 + @@NCONFDIR@@/plugin-conf.d/*
710 @@STATEDIR@@/munin-node.pid
711 @@LOGDIR@@/munin-node.log
713 diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-sched
714 --- munin-2.0.25.orig/node/sbin/munin-sched 2014-11-24 21:46:24.000000000 +0000
715 +++ munin-2.0.25/node/sbin/munin-sched 2015-09-08 10:13:31.747593251 +0000
716 @@ -34,8 +34,8 @@ use Munin::Node::Config;
717 use Munin::Node::ProxySpooler;
720 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
721 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
722 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
723 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
724 my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
727 @@ -164,7 +164,7 @@ and returning the output they produce.
729 =item B<< --config <configfile> >>
731 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
732 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
734 =item B< --[no]paranoia >
736 @@ -182,9 +182,9 @@ View debug messages. This can be very v
740 - @@CONFDIR@@/munin-node.conf
741 - @@CONFDIR@@/plugins/*
742 - @@CONFDIR@@/plugin-conf.d/*
743 + @@NCONFDIR@@/munin-node.conf
744 + @@NCONFDIR@@/plugins/*
745 + @@NCONFDIR@@/plugin-conf.d/*
746 @@STATEDIR@@/munin-sched.pid
747 @@LOGDIR@@/munin-sched.log
749 diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugins/node.d/exim_mailqueue.in
750 --- munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in 2014-11-24 21:46:24.000000000 +0000
751 +++ munin-2.0.25/plugins/node.d/exim_mailqueue.in 2015-09-08 10:13:31.747593251 +0000
752 @@ -15,7 +15,7 @@ examine the queue directories. This is
756 -Configuration parameters for a file in @@CONFDIR@@/plugin-conf.d/
757 +Configuration parameters for a file in @@NCONFDIR@@/plugin-conf.d/
758 if you need to override the defaults below:
761 diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins/node.d/ipmi_sensor_.in
762 --- munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in 2014-11-24 21:46:24.000000000 +0000
763 +++ munin-2.0.25/plugins/node.d/ipmi_sensor_.in 2015-09-08 10:13:31.747593251 +0000
764 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
765 ipmitool probably needs to be run as root, and it may take more than
766 10 seconds on some hosts.
768 -Add the following to your @@CONFDIR@@/munin-node:
769 +Add the following to your @@NCONFDIR@@/munin-node:
773 @@ -49,7 +49,7 @@ with this program; if not, write to the
777 -Plugin reads @@CONFDIR@@/ipmi directly, instead of reading environment
778 +Plugin reads @@NCONFDIR@@/ipmi directly, instead of reading environment
782 @@ -72,7 +72,7 @@ import re
783 CACHEDIR = environ['MUNIN_PLUGSTATE']
784 CACHEFILE = "plugin-ipmi_sensor.cache"
786 -CONFIG = '@@CONFDIR@@/ipmi'
787 +CONFIG = '@@NCONFDIR@@/ipmi'
791 diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in
792 --- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in 2015-09-08 10:05:48.000000000 +0000
793 +++ munin-2.0.25/plugins/node.d/mysql_innodb.in 2015-09-08 10:13:31.748593251 +0000
794 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
798 -Configuration parameters for @@CONFDIR@@/mysql_innodb,
799 +Configuration parameters for @@NCONFDIR@@/mysql_innodb,
800 if you need to override the defaults below:
803 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
804 --- munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in 2014-11-24 21:46:24.000000000 +0000
805 +++ munin-2.0.25/plugins/node.d/mysql_isam_space_.in 2015-09-08 10:13:31.748593251 +0000
806 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
810 -Configuration parameters for @@CONFDIR@@/PLUGIN,
811 +Configuration parameters for @@NCONFDIR@@/PLUGIN,
812 if you need to override the defaults below:
815 diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in
816 --- munin-2.0.25.orig/plugins/node.d/mysql_threads.in 2015-09-08 10:05:48.000000000 +0000
817 +++ munin-2.0.25/plugins/node.d/mysql_threads.in 2015-09-08 10:13:31.748593251 +0000
818 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
822 -Configuration parameters for @@CONFDIR@@/mysql_threads, if you
823 +Configuration parameters for @@NCONFDIR@@/mysql_threads, if you
824 need to override the defaults below:
827 diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d/named.in
828 --- munin-2.0.25.orig/plugins/node.d/named.in 2014-11-24 21:46:24.000000000 +0000
829 +++ munin-2.0.25/plugins/node.d/named.in 2015-09-08 10:13:31.749593251 +0000
830 @@ -34,7 +34,7 @@ restrictions on the log file.
834 -Configuration parameters for @@CONFDIR@@/named,
835 +Configuration parameters for @@NCONFDIR@@/named,
836 if you need to override the defaults below:
839 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
840 --- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:05:48.000000000 +0000
841 +++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:13:31.749593251 +0000
842 @@ -12,7 +12,7 @@ the NTP status
846 -This plugin optionally reads the file @@CONFDIR@@/ntp-freq-comp, which
847 +This plugin optionally reads the file @@NCONFDIR@@/ntp-freq-comp, which
848 should contain a number to be added to the frequency read by ntpdc.
851 @@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then
855 -if [ -f @@CONFDIR@@/ntp-freq-comp ]; then
856 - fcomp=`cat @@CONFDIR@@/ntp-freq-comp`
857 +if [ -f @@NCONFDIR@@/ntp-freq-comp ]; then
858 + fcomp=`cat @@NCONFDIR@@/ntp-freq-comp`
862 diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/plugins/node.d/postfix_mailstats.in
863 --- munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in 2014-11-24 21:46:24.000000000 +0000
864 +++ munin-2.0.25/plugins/node.d/postfix_mailstats.in 2015-09-08 10:13:31.749593251 +0000
865 @@ -8,7 +8,7 @@ rejected by postfix
869 -Configuration parameters for @@CONFDIR@@/postfix_mailstats,
870 +Configuration parameters for @@NCONFDIR@@/postfix_mailstats,
871 if you need to override the defaults below:
874 diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/psu_.in
875 --- munin-2.0.25.orig/plugins/node.d/psu_.in 2014-11-24 21:46:24.000000000 +0000
876 +++ munin-2.0.25/plugins/node.d/psu_.in 2015-09-08 10:13:31.750593251 +0000
877 @@ -15,7 +15,7 @@ we wish to graph.
881 - ln -s @@LIBDIR@@/plugins/psu_ @@CONFDIR@@/plugins/psu_foo
882 + ln -s @@LIBDIR@@/plugins/psu_ @@NCONFDIR@@/plugins/psu_foo
884 ...will monitor the user "foo"
886 diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/node.d/squeezebox_.in
887 --- munin-2.0.25.orig/plugins/node.d/squeezebox_.in 2014-11-24 21:46:24.000000000 +0000
888 +++ munin-2.0.25/plugins/node.d/squeezebox_.in 2015-09-08 10:13:31.750593251 +0000
889 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
890 non-default configuration, please use the environment variables
891 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
892 nc(1) binary is not called "nc", or not the one in $PATH, please define it
893 -in the plugin's environment file (@@CONFDIR@@/squeezebox or similar).
894 +in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar).
898 diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/node.d/varnish_.in
899 --- munin-2.0.25.orig/plugins/node.d/varnish_.in 2014-11-24 21:46:24.000000000 +0000
900 +++ munin-2.0.25/plugins/node.d/varnish_.in 2015-09-08 10:13:31.750593251 +0000
901 @@ -54,7 +54,7 @@ session, session_herd
902 You can link them yourself with something like this:
904 ln -s @@LIBDIR@@/plugins/varnish_ \
905 - @@CONFDIR@@/plugins/varnish_data_structures
906 + @@NCONFDIR@@/plugins/varnish_data_structures
908 =head1 INTERPRETATION
910 diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/node.d.cygwin/df.in
911 --- munin-2.0.25.orig/plugins/node.d.cygwin/df.in 2014-11-24 21:46:24.000000000 +0000
912 +++ munin-2.0.25/plugins/node.d.cygwin/df.in 2015-09-08 10:13:31.751593251 +0000
913 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
917 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
918 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
920 The plugin excludes per default the following special, read-only or
921 dynamically allocating file systems from graphing:
922 diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/node.d.debug/if.in
923 --- munin-2.0.25.orig/plugins/node.d.debug/if.in 2014-11-24 21:46:24.000000000 +0000
924 +++ munin-2.0.25/plugins/node.d.debug/if.in 2015-09-08 10:13:31.751593251 +0000
925 @@ -21,7 +21,7 @@ variable. For example:
929 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
930 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
934 diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/node.d.debug/tc.in
935 --- munin-2.0.25.orig/plugins/node.d.debug/tc.in 2014-11-24 21:46:24.000000000 +0000
936 +++ munin-2.0.25/plugins/node.d.debug/tc.in 2015-09-08 10:13:31.751593251 +0000
937 @@ -21,7 +21,7 @@ For example:
941 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
942 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
946 diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/node.d.linux/acpi.in
947 --- munin-2.0.25.orig/plugins/node.d.linux/acpi.in 2014-11-24 21:46:24.000000000 +0000
948 +++ munin-2.0.25/plugins/node.d.linux/acpi.in 2015-09-08 10:13:31.751593251 +0000
949 @@ -17,7 +17,7 @@ Load the 'thermal_zone' kernel module an
953 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
954 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
956 =head1 INTERPRETATION
958 diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/node.d.linux/apt.in
959 --- munin-2.0.25.orig/plugins/node.d.linux/apt.in 2014-11-24 21:46:24.000000000 +0000
960 +++ munin-2.0.25/plugins/node.d.linux/apt.in 2015-09-08 10:13:31.752593251 +0000
961 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob
965 -Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node.
966 +Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node.
970 diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/node.d.linux/df.in
971 --- munin-2.0.25.orig/plugins/node.d.linux/df.in 2014-11-24 21:46:24.000000000 +0000
972 +++ munin-2.0.25/plugins/node.d.linux/df.in 2015-09-08 10:13:31.752593251 +0000
973 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl
977 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
978 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
980 You may specify filesystem specific warning and critical levels:
982 @@ -55,7 +55,7 @@ RE will not be included.
986 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
987 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
991 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
992 --- munin-2.0.25.orig/plugins/node.d.linux/df_inode.in 2014-11-24 21:46:24.000000000 +0000
993 +++ munin-2.0.25/plugins/node.d.linux/df_inode.in 2015-09-08 10:13:31.752593251 +0000
994 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl
998 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
999 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
1001 You may specify filesystem specific warning and critical levels:
1003 @@ -55,7 +55,7 @@ RE will not be included.
1007 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1008 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1010 =head1 MAGIC MARKERS
1012 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
1013 --- munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in 2014-11-24 21:46:24.000000000 +0000
1014 +++ munin-2.0.25/plugins/node.d.linux/fw_conntrack.in 2015-09-08 10:13:31.753593251 +0000
1015 @@ -11,7 +11,7 @@ This plugin must run with root privilege
1017 =head2 CONFIGURATION EXAMPLE
1019 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1020 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1024 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
1025 --- munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in 2014-11-24 21:46:24.000000000 +0000
1026 +++ munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in 2015-09-08 10:13:31.753593251 +0000
1027 @@ -10,7 +10,7 @@ This plugin must run with root privilege
1029 =head2 CONFIGURATION EXAMPLE
1031 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1032 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1036 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
1037 --- munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in 2014-11-24 21:46:24.000000000 +0000
1038 +++ munin-2.0.25/plugins/node.d.linux/fw_packets.in 2015-09-08 10:13:31.754593251 +0000
1039 @@ -11,7 +11,7 @@ This plugin must run with root privilege
1041 =head1 CONFIGURATION EXAMPLE
1043 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1044 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1048 diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in
1049 --- munin-2.0.25.orig/plugins/node.d.linux/iostat.in 2015-09-08 10:05:55.000000000 +0000
1050 +++ munin-2.0.25/plugins/node.d.linux/iostat.in 2015-09-08 10:13:31.754593251 +0000
1051 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
1055 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1056 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1058 =head1 INTERPRETATION
1060 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
1061 --- munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in 2014-11-24 21:46:24.000000000 +0000
1062 +++ munin-2.0.25/plugins/node.d.linux/iostat_ios.in 2015-09-08 10:13:31.754593251 +0000
1063 @@ -15,7 +15,7 @@ None needed
1067 -Link this into @@CONFDIR@@/plugins/ and restart the munin-node.
1068 +Link this into @@NCONFDIR@@/plugins/ and restart the munin-node.
1070 =head1 INTERPRETATION
1072 diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugins/node.d.linux/irqstats.in
1073 --- munin-2.0.25.orig/plugins/node.d.linux/irqstats.in 2014-11-24 21:46:24.000000000 +0000
1074 +++ munin-2.0.25/plugins/node.d.linux/irqstats.in 2015-09-08 10:13:31.754593251 +0000
1075 @@ -15,7 +15,7 @@ None needed
1079 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1080 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1082 =head1 INTERPRETATION
1084 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
1085 --- munin-2.0.25.orig/resources/hpux-init.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000
1086 +++ munin-2.0.25/resources/hpux-init.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000
1088 PATH=/sbin:/bin:/usr/sbin:/usr/bin
1090 DAEMON=@@SBINDIR@@/$NAME
1091 -CONFFILE=@@CONFDIR@@/munin-node.conf
1092 +CONFFILE=@@NCONFDIR@@/munin-node.conf
1093 RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
1094 PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
1095 MYCONF=/etc/rc.config.d/muninconf
1096 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
1097 --- munin-2.0.25.orig/resources/linux-cron.d_munin-node.in 2014-11-24 21:46:24.000000000 +0000
1098 +++ munin-2.0.25/resources/linux-cron.d_munin-node.in 2015-09-08 10:13:31.755593251 +0000
1099 @@ -8,5 +8,5 @@ MAILTO=root
1100 # an hour (12 invokations an hour, 1 in 12 chance that the update will
1101 # happen), but ensure that there will never be more than two hour (7200
1102 # seconds) interval between updates..
1103 -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
1104 +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
1106 diff -urNp munin-2.0.25.orig/t/Makefile.config munin-2.0.25/t/Makefile.config
1107 --- munin-2.0.25.orig/t/Makefile.config 2014-11-24 21:46:24.000000000 +0000
1108 +++ munin-2.0.25/t/Makefile.config 2015-09-08 10:13:31.755593251 +0000
1110 PREFIX = $(PWD)/t/install
1112 # Where Munin keeps its configurations (server.conf, client.conf, ++)
1113 -CONFDIR = $(PREFIX)/etc
1114 +MCONFDIR = $(PREFIX)/etc
1115 +NCONFDIR = $(PREFIX)/etc
1117 # Client only - Where to put RRD files and other intenal data
1118 DBDIR = $(PREFIX)/var/lib