1 diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm
2 --- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:44.276033000 +0000
3 +++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:25:02.395033000 +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 -urNpa munin-2.0.42.orig/doc/installation/configuration.rst munin-2.0.42/doc/installation/configuration.rst
15 --- munin-2.0.42.orig/doc/installation/configuration.rst 2018-10-11 15:24:44.284033000 +0000
16 +++ munin-2.0.42/doc/installation/configuration.rst 2018-10-11 15:25:02.395033000 +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 -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
36 --- munin-2.0.42.orig/Makefile 2018-10-11 15:24:44.275033000 +0000
37 +++ munin-2.0.42/Makefile 2018-10-11 16:29:37.518033000 +0000
38 @@ -81,7 +81,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 @@ -96,14 +96,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 @@ -136,7 +137,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 @@ -157,14 +158,14 @@ install-node-plugins: install-plugins-pr
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 @# Process the OS specific plugins at the end. Otherwise they would be overridden by the
92 @@ -204,7 +205,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 @@ -240,7 +241,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 @@ -283,7 +285,8 @@ $(CONFVAR_SUBSTITUTION_DEP_FILES): build
113 substitute-confvar-inline:
114 perl -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \
115 - -e 's|\@\@CONFDIR\@\@|$(CONFDIR)|g;' \
116 + -e 's|\@\@MCONFDIR\@\@|$(MCONFDIR)|g;' \
117 + -e 's|\@\@NCONFDIR\@\@|$(NCONFDIR)|g;' \
118 -e 's|\@\@BINDIR\@\@|$(BINDIR)|g;' \
119 -e 's|\@\@SBINDIR\@\@|$(SBINDIR)|g;' \
120 -e 's|\@\@DOCDIR\@\@|$(DOCDIR)|g;' \
121 @@ -339,7 +342,8 @@ common/blib/lib/Munin/Common/Defaults.pm
122 substitute-build-defaults-inline:
123 rm -f common/blib/lib/Munin/Common/Defaults.pm
124 $(PERL) -pe 's{(PREFIX\s+=\s).*}{\1q{$(PREFIX)};}x; \
125 - s{(CONFDIR\s+=\s).*}{\1q{$(CONFDIR)};}x; \
126 + s{(MCONFDIR\s+=\s).*}{\1q{$(MCONFDIR)};}x; \
127 + s{(NCONFDIR\s+=\s).*}{\1q{$(NCONFDIR)};}x; \
128 s{(BINDIR\s+=\s).*}{\1q{$(BINDIR)};}x; \
129 s{(SBINDIR\s+=\s).*}{\1q{$(SBINDIR)};}x; \
130 s{(DOCDIR\s+=\s).*}{\1q{$(DOCDIR)};}x; \
131 @@ -493,7 +497,7 @@ old-test: t/*.t
132 $(MAKE) $@ CONFIG=t/Makefile.config
134 test_plugins = id_default id_root env
135 -old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
136 +old-test: t/*.t t/install $(addprefix $(NCONFDIR)/plugins/,$(test_plugins))
137 @for test in t/*.t; do \
138 echo -n "$$test: "; \
139 PERL5LIB=$(PERLLIB) $(PERL) $$test;\
140 @@ -501,10 +505,10 @@ old-test: t/*.t t/install $(addprefix $(
143 node-monkeywrench: install-node
144 - rm -rf $(CONFDIR)/plugins
145 + rm -rf $(NCONFDIR)/plugins
146 rm -rf $(LIBDIR)/plugins
147 mkdir -p $(LIBDIR)/plugins
148 - mkdir -p $(CONFDIR)/plugins
149 + mkdir -p $(NCONFDIR)/plugins
150 cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
151 $(SBINDIR)/munin-node-configure --suggest
153 diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
154 --- munin-2.0.42.orig/Makefile.config 2018-10-11 15:24:44.282033000 +0000
155 +++ munin-2.0.42/Makefile.config 2018-10-11 15:25:02.396033000 +0000
157 PREFIX = $(DESTDIR)/usr
159 # Where Munin keeps its configurations (server.conf, client.conf, ++)
160 -CONFDIR = $(DESTDIR)/etc/munin
161 +NCONFDIR = $(DESTDIR)/etc/munin
162 +MCONFDIR = $(DESTDIR)/etc/webapps/munin
164 # Server only - where to put munin-cron
165 BINDIR = $(PREFIX)/bin
166 diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej
167 --- munin-2.0.42.orig/Makefile.rej 2018-10-11 15:24:44.282033000 +0000
168 +++ munin-2.0.42/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
170 ---- Makefile 2015-09-08 10:02:24.000000000 +0000
171 -+++ Makefile 2015-09-08 10:12:45.899593251 +0000
172 -@@ -249,6 +249,7 @@ build/%: %.in
173 - -e 's|@@GOODSH@@|$(GOODSH)|g' \
174 - -e 's|@@BASH@@|$(BASH)|g' \
175 - -e 's|@@HASSETR@@|$(HASSETR)|g' \
176 -+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
180 -@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
181 - s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
182 - s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
183 - s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
184 -- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
185 -+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
186 -+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
189 - build-doc: build-doc-stamp Makefile Makefile.config
190 diff -urNpa munin-2.0.42.orig/master/_bin/munin-cgi-graph.in munin-2.0.42/master/_bin/munin-cgi-graph.in
191 --- munin-2.0.42.orig/master/_bin/munin-cgi-graph.in 2018-10-11 15:24:44.285033000 +0000
192 +++ munin-2.0.42/master/_bin/munin-cgi-graph.in 2018-10-11 15:25:02.396033000 +0000
193 @@ -44,7 +44,7 @@ use Munin::Master::Logger;
194 use Log::Log4perl qw( :easy );
196 my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
197 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
198 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
200 my %period = ( "day" => 300,
202 diff -urNpa munin-2.0.42.orig/master/_bin/munin-check.in munin-2.0.42/master/_bin/munin-check.in
203 --- munin-2.0.42.orig/master/_bin/munin-check.in 2018-10-11 15:24:44.285033000 +0000
204 +++ munin-2.0.42/master/_bin/munin-check.in 2018-10-11 15:25:02.396033000 +0000
205 @@ -163,7 +163,7 @@ done
206 norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
207 norec=yes perm_ok @@PLUGSTATE@@ 775
209 -norec=yes perm_ok @@CONFDIR@@/plugin-conf.d 755
210 +norec=yes perm_ok @@NCONFDIR@@/plugin-conf.d 755
212 echo "Check done. Please note that this script only checks most things,"
213 echo "not all things."
214 diff -urNpa munin-2.0.42.orig/master/_bin/munin-graph.in munin-2.0.42/master/_bin/munin-graph.in
215 --- munin-2.0.42.orig/master/_bin/munin-graph.in 2018-10-11 15:24:44.285033000 +0000
216 +++ munin-2.0.42/master/_bin/munin-graph.in 2018-10-11 15:25:02.396033000 +0000
217 @@ -51,7 +51,7 @@ use Munin::Master::Logger;
218 use Log::Log4perl qw( :easy );
220 my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
221 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
222 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
224 my %period = ( "day" => 300,
226 diff -urNpa munin-2.0.42.orig/master/_bin/munin-limits.in munin-2.0.42/master/_bin/munin-limits.in
227 --- munin-2.0.42.orig/master/_bin/munin-limits.in 2018-10-11 15:24:44.285033000 +0000
228 +++ munin-2.0.42/master/_bin/munin-limits.in 2018-10-11 15:25:02.396033000 +0000
229 @@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
231 =item B<< --config <file> >>
233 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
234 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
236 =item B<< --always-send <severity list> >>
238 @@ -114,7 +114,7 @@ configuration file contains the necessar
242 - @@CONFDIR@@/munin.conf
243 + @@MCONFDIR@@/munin.conf
247 diff -urNpa munin-2.0.42.orig/master/_bin/munin-update.in munin-2.0.42/master/_bin/munin-update.in
248 --- munin-2.0.42.orig/master/_bin/munin-update.in 2018-10-11 15:24:44.285033000 +0000
249 +++ munin-2.0.42/master/_bin/munin-update.in 2018-10-11 15:25:02.396033000 +0000
250 @@ -139,7 +139,7 @@ munin-update [options]
252 =item B<< --config_file=<file> >>
254 -Use E<lt>fileE<gt> as the configuration file. [@@CONFDIR@@/munin.conf]
255 +Use E<lt>fileE<gt> as the configuration file. [@@MCONFDIR@@/munin.conf]
257 =item B<< --[no]debug >>
259 @@ -192,7 +192,7 @@ and the directories to store them in.
263 - @@CONFDIR@@/munin.conf
264 + @@MCONFDIR@@/munin.conf
266 @@LOGDIR@@/munin-update
268 diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in
269 --- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:24:44.285033000 +0000
270 +++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:25:02.396033000 +0000
271 @@ -27,7 +27,7 @@ something like:
275 -The default location of F<munin.conf> is F<@@CONFDIR@@/munin.conf>.
276 +The default location of F<munin.conf> is F<@@MCONFDIR@@/munin.conf>.
277 If your placement deviates from this norm, use the "--config
278 E<lt>fileE<gt>"-option when running the munin-* programs.
280 @@ -162,20 +162,20 @@ is C<no>. Affects: munin-update.
281 =item B<tls_private_key> <value>
283 This directive sets the location of the private key to be used for
284 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
285 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
286 certificate can be stored in the same file. Affects: munin-update.
288 =item B<tls_certificate> <value>
290 This directive sets the location of the TLS certificate to be used for
291 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
292 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
293 certificate can be stored in the same file. Affects: munin-update.
295 =item B<tls_ca_certificate> <value>
297 This directive sets the CA certificate to be used to verify the node's
298 certificate, if tls_verify_certificate is set to C<yes>. Default is
299 -@@CONFDIR@@/cacert.pem. Affects: munin-update.
300 +@@MCONFDIR@@/cacert.pem. Affects: munin-update.
302 =item B<tls_verify_depth> <value>
304 diff -urNpa munin-2.0.42.orig/master/doc/munin-cron.pod.in munin-2.0.42/master/doc/munin-cron.pod.in
305 --- munin-2.0.42.orig/master/doc/munin-cron.pod.in 2018-10-11 15:24:44.285033000 +0000
306 +++ munin-2.0.42/master/doc/munin-cron.pod.in 2018-10-11 15:25:02.396033000 +0000
307 @@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
309 =item B<< --config <file> >>
311 -Use E<lt>fileE<gt> as configuration file. [F<@@CONFDIR@@/munin.conf>]
312 +Use E<lt>fileE<gt> as configuration file. [F<@@MCONFDIR@@/munin.conf>]
316 diff -urNpa munin-2.0.42.orig/master/extras/munin-update_old.in munin-2.0.42/master/extras/munin-update_old.in
317 --- munin-2.0.42.orig/master/extras/munin-update_old.in 2018-10-11 15:24:44.285033000 +0000
318 +++ munin-2.0.42/master/extras/munin-update_old.in 2018-10-11 15:25:02.396033000 +0000
319 @@ -43,7 +43,7 @@ my $DEBUG=0;
323 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
324 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
327 my $serversocket = "munin-server-socket.$$";
328 @@ -159,7 +159,7 @@ Options:
329 --host <host> Limit graphed hosts to <host>. Multiple --host options
331 --config <file> Use <file> as configuration file.
332 - [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf]
333 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
334 --[no]debug View debug messages. [--nodebug]
335 --[no]fork Don't fork one instance for each host. [--fork]
336 --timeout=<seconds> TCP timeout when talking to clients. [$timeout]
337 @@ -752,11 +752,11 @@ sub run_starttls_if_required {
340 $key = $cert = munin_get ($config, "tls_pem");
341 - $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
342 + $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
344 - $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
345 + $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
346 unless defined $cert;
347 - $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem")
348 + $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem")
349 unless defined $ca_cert;
350 $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
351 $depth=&munin_get ($config, "tls_verify_depth", 5);
352 @@ -1088,7 +1088,7 @@ Limit fetched data to those from E<lt>ho
354 =item B<< --config <file> >>
356 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
357 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
361 @@ -1124,7 +1124,7 @@ and the directories to store them in.
365 - @@CONFDIR@@/munin.conf
366 + @@MCONFDIR@@/munin.conf
368 @@LOGDIR@@/munin-update
370 diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm
371 --- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:44.285033000 +0000
372 +++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:25:02.397033000 +0000
373 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
377 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
378 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
379 dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
382 @@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw(
383 rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
386 - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
387 - tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
388 - tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
389 + tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem",
390 + tls_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
391 + tls_private_key => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
392 tls_verify_certificate => 0,
393 tls_verify_depth => 5,
394 tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
395 diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.42/master/lib/Munin/Master/GraphOld.pm
396 --- munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:24:44.285033000 +0000
397 +++ munin-2.0.42/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:25:02.397033000 +0000
398 @@ -97,7 +97,7 @@ my $skip_locking = 0;
401 my $force_run_as_root = 0;
402 -my $conffile = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf";
403 +my $conffile = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf";
404 my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR;
405 # Note: Nothing by default is more convenient and elliminates code while
406 # for cgi graphing - but it breaks how munin-graph expected stuff to work.
407 diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm
408 --- munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:24:44.285033000 +0000
409 +++ munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:25:02.397033000 +0000
410 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
411 my @times = ("day", "week", "month", "year");
414 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
415 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
419 @@ -859,7 +859,7 @@ Options:
420 --service <service> Compatibility. No effect.
421 --host <host> Compatibility. No effect.
422 --config <file> Use <file> as configuration file.
423 - [/etc/munin/munin.conf]
424 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
428 @@ -894,7 +894,7 @@ Compatibility. No effect.
430 =item B<< --config <file> >>
432 -Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf]
433 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
437 @@ -917,7 +917,7 @@ Munin-html creates the html pages.
441 - @@CONFDIR@@/munin.conf
442 + @@MCONFDIR@@/munin.conf
444 @@LOGDIR@@/munin-html
446 diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm
447 --- munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:24:44.285033000 +0000
448 +++ munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:25:02.397033000 +0000
449 @@ -52,7 +52,7 @@ use Munin::Master::Utils;
450 use Munin::Common::Defaults;
453 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
454 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
457 my @limit_hosts = ();
458 @@ -242,7 +242,7 @@ Options:
459 --contact <contact> Limit notified contacts to <contact>. Multiple
460 --contact options may be supplied.
461 --config <file> Use <file> as configuration file.
462 - [/etc/munin/munin.conf]
463 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
467 diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm
468 --- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:44.285033000 +0000
469 +++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:25:02.397033000 +0000
470 @@ -114,7 +114,7 @@ my $config_parts = {
474 -my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
475 +my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
477 # Fields to copy when "aliasing" a field
478 my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info");
479 diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in
480 --- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:24:44.286033000 +0000
481 +++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:25:02.397033000 +0000
483 # cgitmpdir @@DBDIR@@/cgi-tmp
485 # (Exactly one) directory to include all files from.
486 -includedir @@CONFDIR@@/munin-conf.d
487 +includedir @@MCONFDIR@@/munin-conf.d
489 # You can choose the time reference for "DERIVE" like graphs, and show
490 # "per minute", "per hour" values instead of the default "per second"
491 diff -urNpa munin-2.0.42.orig/master/t/munin_master_config.t munin-2.0.42/master/t/munin_master_config.t
492 --- munin-2.0.42.orig/master/t/munin_master_config.t 2018-10-11 15:24:44.285033000 +0000
493 +++ munin-2.0.42/master/t/munin_master_config.t 2018-10-11 15:25:02.398033000 +0000
494 @@ -24,7 +24,7 @@ my $fasit = {
498 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
499 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
500 dbdir => '/opt/munin/sandbox/var/opt/munin',
503 diff -urNpa munin-2.0.42.orig/master/www/munin-htaccess.in munin-2.0.42/master/www/munin-htaccess.in
504 --- munin-2.0.42.orig/master/www/munin-htaccess.in 2018-10-11 15:24:44.286033000 +0000
505 +++ munin-2.0.42/master/www/munin-htaccess.in 2018-10-11 15:25:02.398033000 +0000
508 # <directory @@HTMLDIR@@>
510 -AuthUserFile @@CONFDIR@@/munin-htpasswd
511 +AuthUserFile @@MCONFDIR@@/munin-htpasswd
515 diff -urNpa munin-2.0.42.orig/node/bin/munindoc munin-2.0.42/node/bin/munindoc
516 --- munin-2.0.42.orig/node/bin/munindoc 2018-10-11 15:24:44.286033000 +0000
517 +++ munin-2.0.42/node/bin/munindoc 2018-10-11 15:25:02.398033000 +0000
518 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
520 # Dirs in which to look for $plugin.pod and $plugin files.
521 my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
522 - "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins",
523 + "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins",
524 "$Munin::Common::Defaults::MUNIN_PERLLIB");
526 File::Find::find({wanted => \&wanted_pod}, @DIRS);
527 diff -urNpa munin-2.0.42.orig/node/doc/munin-node.conf.pod munin-2.0.42/node/doc/munin-node.conf.pod
528 --- munin-2.0.42.orig/node/doc/munin-node.conf.pod 2018-10-11 15:24:44.286033000 +0000
529 +++ munin-2.0.42/node/doc/munin-node.conf.pod 2018-10-11 15:25:02.398033000 +0000
530 @@ -91,20 +91,20 @@ is C<no>.
531 =item B<tls_private_key> <value>
533 This directive sets the location of the private key to be used for
534 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
535 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
536 certificate can be stored in the same file.
538 =item B<tls_certificate> <value>
540 This directive sets the location of the TLS certificate to be used for
541 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
542 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
543 certificate can be stored in the same file.
545 =item B<tls_ca_certificate> <value>
547 This directive sets the CA certificate to be used to verify the node's
548 certificate, if tls_verify_certificate is set to C<yes>. Default is
549 -@@CONFDIR@@/cacert.pem.
550 +@@NCONFDIR@@/cacert.pem.
552 =item B<tls_verify_depth> <value>
554 diff -urNpa munin-2.0.42.orig/node/extras/munin-node-simple.in munin-2.0.42/node/extras/munin-node-simple.in
555 --- munin-2.0.42.orig/node/extras/munin-node-simple.in 2018-10-11 15:24:44.286033000 +0000
556 +++ munin-2.0.42/node/extras/munin-node-simple.in 2018-10-11 15:25:02.398033000 +0000
557 @@ -28,8 +28,8 @@ use strict;
561 -my $clientdir = "@@CONFDIR@@/node.d";
562 -my $conffile = "@@CONFDIR@@/node-simple.conf";
563 +my $clientdir = "@@NCONFDIR@@/node.d";
564 +my $conffile = "@@NCONFDIR@@/node-simple.conf";
565 my $version = "@@VERSION@@";
568 diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Config.pm munin-2.0.42/node/lib/Munin/Node/Config.pm
569 --- munin-2.0.42.orig/node/lib/Munin/Node/Config.pm 2018-10-11 15:24:44.286033000 +0000
570 +++ munin-2.0.42/node/lib/Munin/Node/Config.pm 2018-10-11 15:25:02.398033000 +0000
571 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
574 $instance ||= bless {
575 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf",
576 + config_file => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf",
580 diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Server.pm munin-2.0.42/node/lib/Munin/Node/Server.pm
581 --- munin-2.0.42.orig/node/lib/Munin/Node/Server.pm 2018-10-11 15:24:44.286033000 +0000
582 +++ munin-2.0.42/node/lib/Munin/Node/Server.pm 2018-10-11 15:25:02.398033000 +0000
583 @@ -272,11 +272,11 @@ sub _process_starttls_command {
584 my $mode = $session->{tls_mode};
586 my $key = $config->{tls_private_key}
587 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
588 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
589 my $cert = $config->{tls_certificate}
590 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
591 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
592 my $ca_cert = $config->{tls_ca_certificate}
593 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem";
594 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem";
595 my $tls_verify = $config->{tls_verify_certificate}
597 my $tls_match = $config->{tls_match};
598 diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Service.pm munin-2.0.42/node/lib/Munin/Node/Service.pm
599 --- munin-2.0.42.orig/node/lib/Munin/Node/Service.pm 2018-10-11 15:24:44.286033000 +0000
600 +++ munin-2.0.42/node/lib/Munin/Node/Service.pm 2018-10-11 15:25:02.398033000 +0000
601 @@ -22,7 +22,7 @@ sub new
602 my ($class, %args) = @_;
605 - $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
606 + $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
608 $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
609 $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
610 diff -urNpa munin-2.0.42.orig/node/sbin/munin-node munin-2.0.42/node/sbin/munin-node
611 --- munin-2.0.42.orig/node/sbin/munin-node 2018-10-11 15:24:44.286033000 +0000
612 +++ munin-2.0.42/node/sbin/munin-node 2018-10-11 15:25:02.398033000 +0000
613 @@ -36,8 +36,8 @@ use Munin::Node::Service;
614 use Munin::Node::Server;
617 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
618 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
619 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
620 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
624 @@ -164,7 +164,7 @@ and returning the output they produce.
626 =item B<< --config <configfile> >>
628 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
629 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
631 =item B< --[no]paranoia >
633 @@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
637 - @@CONFDIR@@/munin-node.conf
638 - @@CONFDIR@@/plugins/*
639 - @@CONFDIR@@/plugin-conf.d/*
640 + @@NCONFDIR@@/munin-node.conf
641 + @@NCONFDIR@@/plugins/*
642 + @@NCONFDIR@@/plugin-conf.d/*
643 @@STATEDIR@@/munin-node.pid
644 @@LOGDIR@@/munin-node.log
646 diff -urNpa munin-2.0.42.orig/node/sbin/munin-node-configure munin-2.0.42/node/sbin/munin-node-configure
647 --- munin-2.0.42.orig/node/sbin/munin-node-configure 2018-10-11 15:24:44.286033000 +0000
648 +++ munin-2.0.42/node/sbin/munin-node-configure 2018-10-11 15:25:02.399033000 +0000
649 @@ -76,9 +76,9 @@ sub main
653 - my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
654 - my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
655 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
656 + my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
657 + my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
658 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
659 my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
662 @@ -487,15 +487,15 @@ may enable debugging.
664 =item B<< --config <file> >>
666 -Override configuration file [@@CONFDIR@@/munin-node.conf]
667 +Override configuration file [@@NCONFDIR@@/munin-node.conf]
669 =item B<< --servicedir <dir> >>
671 -Override plugin directory [@@CONFDIR@@/plugins/]
672 +Override plugin directory [@@NCONFDIR@@/plugins/]
674 =item B<< --sconfdir <dir> >>
676 -Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]
677 +Override plugin configuration directory [@@NCONFDIR@@/plugin-conf.d/]
679 =item B<< --libdir <dir> >>
681 @@ -649,9 +649,9 @@ not this works with any particular devic
685 - @@CONFDIR@@/munin-node.conf
686 - @@CONFDIR@@/plugin-conf.d/*
687 - @@CONFDIR@@/plugins/*
688 + @@NCONFDIR@@/munin-node.conf
689 + @@NCONFDIR@@/plugin-conf.d/*
690 + @@NCONFDIR@@/plugins/*
691 @@LIBDIR@@/plugins/plugins.history
694 diff -urNpa munin-2.0.42.orig/node/sbin/munin-run munin-2.0.42/node/sbin/munin-run
695 --- munin-2.0.42.orig/node/sbin/munin-run 2018-10-11 15:24:44.286033000 +0000
696 +++ munin-2.0.42/node/sbin/munin-run 2018-10-11 15:25:02.399033000 +0000
697 @@ -35,7 +35,7 @@ use Munin::Node::Service;
701 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
702 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
706 @@ -98,7 +98,7 @@ sub main
709 # Default configuration values
710 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
711 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
715 @@ -189,15 +189,15 @@ as they are under munin-node.
717 =item B<< --config <configfile> >>
719 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
720 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
722 =item B<< --servicedir <dir> >>
724 -Use E<lt>dirE<gt> as plugin dir. [@@CONFDIR@@/plugins/]
725 +Use E<lt>dirE<gt> as plugin dir. [@@NCONFDIR@@/plugins/]
727 =item B<< --sconfdir <dir> >>
729 -Use E<lt>dirE<gt> as plugin configuration dir. [@@CONFDIR@@/plugin-conf.d/]
730 +Use E<lt>dirE<gt> as plugin configuration dir. [@@NCONFDIR@@/plugin-conf.d/]
732 =item B<< --sconffile <file> >>
734 @@ -230,9 +230,9 @@ Show version information.
738 - @@CONFDIR@@/munin-node.conf
739 - @@CONFDIR@@/plugins/*
740 - @@CONFDIR@@/plugin-conf.d/*
741 + @@NCONFDIR@@/munin-node.conf
742 + @@NCONFDIR@@/plugins/*
743 + @@NCONFDIR@@/plugin-conf.d/*
744 @@STATEDIR@@/munin-node.pid
745 @@LOGDIR@@/munin-node.log
747 diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched
748 --- munin-2.0.42.orig/node/sbin/munin-sched 2018-10-11 15:24:44.286033000 +0000
749 +++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000
750 @@ -34,8 +34,8 @@ use Munin::Node::Config;
751 use Munin::Node::ProxySpooler;
754 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
755 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
756 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
757 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
758 my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
761 @@ -164,7 +164,7 @@ and returning the output they produce.
763 =item B<< --config <configfile> >>
765 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
766 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
768 =item B< --[no]paranoia >
770 @@ -182,9 +182,9 @@ View debug messages. This can be very v
774 - @@CONFDIR@@/munin-node.conf
775 - @@CONFDIR@@/plugins/*
776 - @@CONFDIR@@/plugin-conf.d/*
777 + @@NCONFDIR@@/munin-node.conf
778 + @@NCONFDIR@@/plugins/*
779 + @@NCONFDIR@@/plugin-conf.d/*
780 @@STATEDIR@@/munin-sched.pid
781 @@LOGDIR@@/munin-sched.log
783 diff -urNpa munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in munin-2.0.42/plugins/node.d/exim_mailqueue.in
784 --- munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in 2018-10-11 15:24:44.280033000 +0000
785 +++ munin-2.0.42/plugins/node.d/exim_mailqueue.in 2018-10-11 15:25:02.399033000 +0000
786 @@ -17,7 +17,7 @@ examine the queue directories. This is
790 -Configuration parameters for a file in @@CONFDIR@@/plugin-conf.d/
791 +Configuration parameters for a file in @@NCONFDIR@@/plugin-conf.d/
792 if you need to override the defaults below:
795 diff -urNpa munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.42/plugins/node.d/ipmi_sensor_.in
796 --- munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:24:44.280033000 +0000
797 +++ munin-2.0.42/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:25:02.399033000 +0000
798 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
799 ipmitool probably needs to be run as root, and it may take more than
800 10 seconds on some hosts.
802 -Add the following to your @@CONFDIR@@/munin-node:
803 +Add the following to your @@NCONFDIR@@/munin-node:
807 @@ -49,7 +49,7 @@ with this program; if not, write to the
811 -Plugin reads @@CONFDIR@@/ipmi directly, instead of reading environment
812 +Plugin reads @@NCONFDIR@@/ipmi directly, instead of reading environment
816 @@ -72,7 +72,7 @@ import re
817 CACHEDIR = environ['MUNIN_PLUGSTATE']
818 CACHEFILE = "plugin-ipmi_sensor.cache"
820 -CONFIG = '@@CONFDIR@@/ipmi'
821 +CONFIG = '@@NCONFDIR@@/ipmi'
824 def normalize_sensor(name):
825 diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_innodb.in munin-2.0.42/plugins/node.d/mysql_innodb.in
826 --- munin-2.0.42.orig/plugins/node.d/mysql_innodb.in 2018-10-11 15:24:44.282033000 +0000
827 +++ munin-2.0.42/plugins/node.d/mysql_innodb.in 2018-10-11 15:25:02.399033000 +0000
828 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
832 -Configuration parameters for @@CONFDIR@@/mysql_innodb,
833 +Configuration parameters for @@NCONFDIR@@/mysql_innodb,
834 if you need to override the defaults below:
837 diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.42/plugins/node.d/mysql_isam_space_.in
838 --- munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:24:44.280033000 +0000
839 +++ munin-2.0.42/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:25:02.399033000 +0000
840 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
844 -Configuration parameters for @@CONFDIR@@/PLUGIN,
845 +Configuration parameters for @@NCONFDIR@@/PLUGIN,
846 if you need to override the defaults below:
849 diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugins/node.d/mysql_threads.in
850 --- munin-2.0.42.orig/plugins/node.d/mysql_threads.in 2018-10-11 15:24:44.280033000 +0000
851 +++ munin-2.0.42/plugins/node.d/mysql_threads.in 2018-10-11 15:25:02.399033000 +0000
852 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
856 -Configuration parameters for @@CONFDIR@@/mysql_threads, if you
857 +Configuration parameters for @@NCONFDIR@@/mysql_threads, if you
858 need to override the defaults below:
861 diff -urNpa munin-2.0.42.orig/plugins/node.d/named.in munin-2.0.42/plugins/node.d/named.in
862 --- munin-2.0.42.orig/plugins/node.d/named.in 2018-10-11 15:24:44.280033000 +0000
863 +++ munin-2.0.42/plugins/node.d/named.in 2018-10-11 15:25:02.399033000 +0000
864 @@ -34,7 +34,7 @@ restrictions on the log file.
868 -Configuration parameters for @@CONFDIR@@/named,
869 +Configuration parameters for @@NCONFDIR@@/named,
870 if you need to override the defaults below:
873 diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in
874 --- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:24:44.282033000 +0000
875 +++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 16:30:23.898033000 +0000
876 @@ -12,7 +12,7 @@ the NTP status
880 -This plugin optionally reads the file @@CONFDIR@@/ntp-freq-comp, which
881 +This plugin optionally reads the file @@NCONFDIR@@/ntp-freq-comp, which
882 should contain a number to be added to the frequency read by ntpdc.
885 @@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then
889 -if [ -f "@@CONFDIR@@/ntp-freq-comp" ]; then
890 - fcomp=$(cat "@@CONFDIR@@/ntp-freq-comp")
891 +if [ -f "@@NCONFDIR@@/ntp-freq-comp" ]; then
892 + fcomp=$(cat "@@NCONFDIR@@/ntp-freq-comp")
896 diff -urNpa munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in munin-2.0.42/plugins/node.d/postfix_mailstats.in
897 --- munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in 2018-10-11 15:24:44.281033000 +0000
898 +++ munin-2.0.42/plugins/node.d/postfix_mailstats.in 2018-10-11 15:25:02.400033000 +0000
899 @@ -8,7 +8,7 @@ rejected by postfix
903 -Configuration parameters for @@CONFDIR@@/postfix_mailstats,
904 +Configuration parameters for @@NCONFDIR@@/postfix_mailstats,
905 if you need to override the defaults below:
908 diff -urNpa munin-2.0.42.orig/plugins/node.d/psu_.in munin-2.0.42/plugins/node.d/psu_.in
909 --- munin-2.0.42.orig/plugins/node.d/psu_.in 2018-10-11 15:24:44.281033000 +0000
910 +++ munin-2.0.42/plugins/node.d/psu_.in 2018-10-11 15:25:02.400033000 +0000
911 @@ -15,7 +15,7 @@ we wish to graph.
915 - ln -s @@LIBDIR@@/plugins/psu_ @@CONFDIR@@/plugins/psu_foo
916 + ln -s @@LIBDIR@@/plugins/psu_ @@NCONFDIR@@/plugins/psu_foo
918 ...will monitor the user "foo"
920 diff -urNpa munin-2.0.42.orig/plugins/node.d/squeezebox_.in munin-2.0.42/plugins/node.d/squeezebox_.in
921 --- munin-2.0.42.orig/plugins/node.d/squeezebox_.in 2018-10-11 15:24:44.282033000 +0000
922 +++ munin-2.0.42/plugins/node.d/squeezebox_.in 2018-10-11 15:25:02.400033000 +0000
923 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
924 non-default configuration, please use the environment variables
925 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
926 nc(1) binary is not called "nc", or not the one in $PATH, please define it
927 -in the plugin's environment file (@@CONFDIR@@/squeezebox or similar).
928 +in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar).
932 diff -urNpa munin-2.0.42.orig/plugins/node.d/varnish_.in munin-2.0.42/plugins/node.d/varnish_.in
933 --- munin-2.0.42.orig/plugins/node.d/varnish_.in 2018-10-11 15:24:44.282033000 +0000
934 +++ munin-2.0.42/plugins/node.d/varnish_.in 2018-10-11 15:25:02.400033000 +0000
935 @@ -54,7 +54,7 @@ session, session_herd
936 You can link them yourself with something like this:
938 ln -s @@LIBDIR@@/plugins/varnish_ \
939 - @@CONFDIR@@/plugins/varnish_data_structures
940 + @@NCONFDIR@@/plugins/varnish_data_structures
942 =head1 INTERPRETATION
944 diff -urNpa munin-2.0.42.orig/plugins/node.d.cygwin/df.in munin-2.0.42/plugins/node.d.cygwin/df.in
945 --- munin-2.0.42.orig/plugins/node.d.cygwin/df.in 2018-10-11 15:24:44.277033000 +0000
946 +++ munin-2.0.42/plugins/node.d.cygwin/df.in 2018-10-11 15:25:02.400033000 +0000
947 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
951 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
952 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
954 The plugin excludes per default the following special, read-only or
955 dynamically allocating file systems from graphing:
956 diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/if.in munin-2.0.42/plugins/node.d.debug/if.in
957 --- munin-2.0.42.orig/plugins/node.d.debug/if.in 2018-10-11 15:24:44.277033000 +0000
958 +++ munin-2.0.42/plugins/node.d.debug/if.in 2018-10-11 15:25:02.400033000 +0000
959 @@ -21,7 +21,7 @@ variable. For example:
963 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
964 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
968 diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/tc.in munin-2.0.42/plugins/node.d.debug/tc.in
969 --- munin-2.0.42.orig/plugins/node.d.debug/tc.in 2018-10-11 15:24:44.277033000 +0000
970 +++ munin-2.0.42/plugins/node.d.debug/tc.in 2018-10-11 15:25:02.400033000 +0000
971 @@ -21,7 +21,7 @@ For example:
975 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
976 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
980 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/acpi.in munin-2.0.42/plugins/node.d.linux/acpi.in
981 --- munin-2.0.42.orig/plugins/node.d.linux/acpi.in 2018-10-11 15:24:44.278033000 +0000
982 +++ munin-2.0.42/plugins/node.d.linux/acpi.in 2018-10-11 15:25:02.401033000 +0000
983 @@ -17,7 +17,7 @@ Load the 'thermal' kernel module and the
987 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
988 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
990 =head1 INTERPRETATION
992 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/apt.in munin-2.0.42/plugins/node.d.linux/apt.in
993 --- munin-2.0.42.orig/plugins/node.d.linux/apt.in 2018-10-11 15:24:44.278033000 +0000
994 +++ munin-2.0.42/plugins/node.d.linux/apt.in 2018-10-11 15:25:02.401033000 +0000
995 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob
999 -Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node.
1000 +Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node.
1004 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df.in munin-2.0.42/plugins/node.d.linux/df.in
1005 --- munin-2.0.42.orig/plugins/node.d.linux/df.in 2018-10-11 15:24:44.278033000 +0000
1006 +++ munin-2.0.42/plugins/node.d.linux/df.in 2018-10-11 15:25:02.401033000 +0000
1007 @@ -31,7 +31,7 @@ This configuration snipplet is an exampl
1011 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
1012 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
1014 You may specify filesystem specific warning and critical levels:
1016 @@ -58,7 +58,7 @@ RE will not be included.
1020 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1021 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1023 =head1 MAGIC MARKERS
1025 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df_inode.in munin-2.0.42/plugins/node.d.linux/df_inode.in
1026 --- munin-2.0.42.orig/plugins/node.d.linux/df_inode.in 2018-10-11 15:24:44.278033000 +0000
1027 +++ munin-2.0.42/plugins/node.d.linux/df_inode.in 2018-10-11 15:25:02.401033000 +0000
1028 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl
1032 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
1033 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
1035 You may specify filesystem specific warning and critical levels:
1037 @@ -55,7 +55,7 @@ RE will not be included.
1041 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1042 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1044 =head1 MAGIC MARKERS
1046 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.42/plugins/node.d.linux/fw_conntrack.in
1047 --- munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:24:44.278033000 +0000
1048 +++ munin-2.0.42/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:25:02.401033000 +0000
1049 @@ -11,7 +11,7 @@ This plugin must run with root privilege
1051 =head2 CONFIGURATION EXAMPLE
1053 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1054 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1058 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in
1059 --- munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:24:44.278033000 +0000
1060 +++ munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:25:02.401033000 +0000
1061 @@ -10,7 +10,7 @@ This plugin must run with root privilege
1063 =head2 CONFIGURATION EXAMPLE
1065 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1066 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1070 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in munin-2.0.42/plugins/node.d.linux/fw_packets.in
1071 --- munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in 2018-10-11 15:24:44.278033000 +0000
1072 +++ munin-2.0.42/plugins/node.d.linux/fw_packets.in 2018-10-11 15:25:02.401033000 +0000
1073 @@ -14,7 +14,7 @@ This plugin must run with root privilege
1075 =head1 CONFIGURATION EXAMPLE
1077 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1078 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1082 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugins/node.d.linux/iostat.in
1083 --- munin-2.0.42.orig/plugins/node.d.linux/iostat.in 2018-10-11 15:24:44.279033000 +0000
1084 +++ munin-2.0.42/plugins/node.d.linux/iostat.in 2018-10-11 15:25:02.401033000 +0000
1085 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
1089 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1090 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1092 =head1 INTERPRETATION
1094 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.42/plugins/node.d.linux/iostat_ios.in
1095 --- munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:24:44.278033000 +0000
1096 +++ munin-2.0.42/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:25:02.401033000 +0000
1097 @@ -15,7 +15,7 @@ None needed
1101 -Link this into @@CONFDIR@@/plugins/ and restart the munin-node.
1102 +Link this into @@NCONFDIR@@/plugins/ and restart the munin-node.
1104 =head1 INTERPRETATION
1106 diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/irqstats.in munin-2.0.42/plugins/node.d.linux/irqstats.in
1107 --- munin-2.0.42.orig/plugins/node.d.linux/irqstats.in 2018-10-11 15:24:44.278033000 +0000
1108 +++ munin-2.0.42/plugins/node.d.linux/irqstats.in 2018-10-11 15:25:02.401033000 +0000
1109 @@ -18,7 +18,7 @@ None needed
1113 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1114 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1116 =head1 INTERPRETATION
1118 diff -urNpa munin-2.0.42.orig/resources/hpux-init.d_munin-node.in munin-2.0.42/resources/hpux-init.d_munin-node.in
1119 --- munin-2.0.42.orig/resources/hpux-init.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000
1120 +++ munin-2.0.42/resources/hpux-init.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000
1122 PATH=/sbin:/bin:/usr/sbin:/usr/bin
1124 DAEMON=@@SBINDIR@@/$NAME
1125 -CONFFILE=@@CONFDIR@@/munin-node.conf
1126 +CONFFILE=@@NCONFDIR@@/munin-node.conf
1127 RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
1128 PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
1129 MYCONF=/etc/rc.config.d/muninconf
1130 diff -urNpa munin-2.0.42.orig/resources/linux-cron.d_munin-node.in munin-2.0.42/resources/linux-cron.d_munin-node.in
1131 --- munin-2.0.42.orig/resources/linux-cron.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000
1132 +++ munin-2.0.42/resources/linux-cron.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000
1133 @@ -8,5 +8,5 @@ MAILTO=root
1134 # an hour (12 invokations an hour, 1 in 12 chance that the update will
1135 # happen), but ensure that there will never be more than two hour (7200
1136 # seconds) interval between updates..
1137 -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
1138 +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
1140 diff -urNpa munin-2.0.42.orig/t/Makefile.config munin-2.0.42/t/Makefile.config
1141 --- munin-2.0.42.orig/t/Makefile.config 2018-10-11 15:24:44.287033000 +0000
1142 +++ munin-2.0.42/t/Makefile.config 2018-10-11 15:25:02.402033000 +0000
1144 PREFIX = $(PWD)/t/install
1146 # Where Munin keeps its configurations (server.conf, client.conf, ++)
1147 -CONFDIR = $(PREFIX)/etc
1148 +MCONFDIR = $(PREFIX)/etc
1149 +NCONFDIR = $(PREFIX)/etc
1151 # Client only - Where to put RRD files and other intenal data
1152 DBDIR = $(PREFIX)/var/lib