1 diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/common/lib/Munin/Common/Defaults.pm
2 --- munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm 2021-01-04 18:03:15.208803396 +0100
3 +++ munin-2.0.65/common/lib/Munin/Common/Defaults.pm 2021-01-04 18:04:00.437803396 +0100
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 -ur munin-2.0.65.orig/doc/installation/configuration.rst munin-2.0.65/doc/installation/configuration.rst
15 --- munin-2.0.65.orig/doc/installation/configuration.rst 2020-10-28 22:36:02.000000000 +0100
16 +++ munin-2.0.65/doc/installation/configuration.rst 2021-01-04 18:04:00.437803396 +0100
20 Decide which plugins to use. The munin node runs all plugins present
24 The quick auto-plug-and-play solution:
30 -Add some nodes to CONFDIR/munin.conf
31 +Add some nodes to MCONFDIR/munin.conf
35 diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile
36 --- munin-2.0.65.orig/Makefile 2021-01-04 18:03:15.209803396 +0100
37 +++ munin-2.0.65/Makefile 2021-01-04 18:04:00.437803396 +0100
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
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
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)/
75 install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
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
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
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' \
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;' \
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; \
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 @@ -506,10 +510,10 @@
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 -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config
154 --- munin-2.0.65.orig/Makefile.config 2021-01-04 18:03:15.209803396 +0100
155 +++ munin-2.0.65/Makefile.config 2021-01-04 18:04:00.438803396 +0100
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 -ur munin-2.0.65.orig/master/_bin/munin-cgi-graph.in munin-2.0.65/master/_bin/munin-cgi-graph.in
167 --- munin-2.0.65.orig/master/_bin/munin-cgi-graph.in 2020-10-28 22:36:02.000000000 +0100
168 +++ munin-2.0.65/master/_bin/munin-cgi-graph.in 2021-01-04 18:04:00.438803396 +0100
170 use Log::Log4perl qw( :easy );
172 my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
173 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
174 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
176 my %period = ( "day" => 300,
178 diff -ur munin-2.0.65.orig/master/_bin/munin-check.in munin-2.0.65/master/_bin/munin-check.in
179 --- munin-2.0.65.orig/master/_bin/munin-check.in 2020-10-28 22:36:02.000000000 +0100
180 +++ munin-2.0.65/master/_bin/munin-check.in 2021-01-04 18:04:00.438803396 +0100
182 norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
183 norec=yes perm_ok @@PLUGSTATE@@ 775
185 -norec=yes perm_ok @@CONFDIR@@/plugin-conf.d 755
186 +norec=yes perm_ok @@NCONFDIR@@/plugin-conf.d 755
188 echo "Check done. Please note that this script only checks most things,"
189 echo "not all things."
190 diff -ur munin-2.0.65.orig/master/_bin/munin-graph.in munin-2.0.65/master/_bin/munin-graph.in
191 --- munin-2.0.65.orig/master/_bin/munin-graph.in 2020-10-28 22:36:02.000000000 +0100
192 +++ munin-2.0.65/master/_bin/munin-graph.in 2021-01-04 18:04:00.438803396 +0100
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 -ur munin-2.0.65.orig/master/_bin/munin-limits.in munin-2.0.65/master/_bin/munin-limits.in
203 --- munin-2.0.65.orig/master/_bin/munin-limits.in 2020-10-28 22:36:02.000000000 +0100
204 +++ munin-2.0.65/master/_bin/munin-limits.in 2021-01-04 18:04:00.438803396 +0100
207 =item B<< --config <file> >>
209 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
210 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
212 =item B<< --always-send <severity list> >>
218 - @@CONFDIR@@/munin.conf
219 + @@MCONFDIR@@/munin.conf
223 diff -ur munin-2.0.65.orig/master/_bin/munin-update.in munin-2.0.65/master/_bin/munin-update.in
224 --- munin-2.0.65.orig/master/_bin/munin-update.in 2020-10-28 22:36:02.000000000 +0100
225 +++ munin-2.0.65/master/_bin/munin-update.in 2021-01-04 18:04:00.439803396 +0100
228 =item B<< --config_file=<file> >>
230 -Use E<lt>fileE<gt> as the configuration file. [@@CONFDIR@@/munin.conf]
231 +Use E<lt>fileE<gt> as the configuration file. [@@MCONFDIR@@/munin.conf]
233 =item B<< --[no]debug >>
239 - @@CONFDIR@@/munin.conf
240 + @@MCONFDIR@@/munin.conf
242 @@LOGDIR@@/munin-update
244 diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/munin.conf.pod.in
245 --- munin-2.0.65.orig/master/doc/munin.conf.pod.in 2021-01-04 18:03:15.209803396 +0100
246 +++ munin-2.0.65/master/doc/munin.conf.pod.in 2021-01-04 18:04:00.439803396 +0100
251 -The default location of F<munin.conf> is F<@@CONFDIR@@/munin.conf>.
252 +The default location of F<munin.conf> is F<@@MCONFDIR@@/munin.conf>.
253 If your placement deviates from this norm, use the "--config
254 E<lt>fileE<gt>"-option when running the munin-* programs.
256 @@ -162,20 +162,20 @@
257 =item B<tls_private_key> <value>
259 This directive sets the location of the private key to be used for
260 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
261 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
262 certificate can be stored in the same file. Affects: munin-update.
264 =item B<tls_certificate> <value>
266 This directive sets the location of the TLS certificate to be used for
267 -TLS. Default is @@CONFDIR@@/munin.pem. The private key and
268 +TLS. Default is @@MCONFDIR@@/munin.pem. The private key and
269 certificate can be stored in the same file. Affects: munin-update.
271 =item B<tls_ca_certificate> <value>
273 This directive sets the CA certificate to be used to verify the node's
274 certificate, if tls_verify_certificate is set to C<yes>. Default is
275 -@@CONFDIR@@/cacert.pem. Affects: munin-update.
276 +@@MCONFDIR@@/cacert.pem. Affects: munin-update.
278 =item B<tls_verify_depth> <value>
280 diff -ur munin-2.0.65.orig/master/doc/munin-cron.pod.in munin-2.0.65/master/doc/munin-cron.pod.in
281 --- munin-2.0.65.orig/master/doc/munin-cron.pod.in 2020-10-28 22:36:02.000000000 +0100
282 +++ munin-2.0.65/master/doc/munin-cron.pod.in 2021-01-04 18:04:00.439803396 +0100
285 =item B<< --config <file> >>
287 -Use E<lt>fileE<gt> as configuration file. [F<@@CONFDIR@@/munin.conf>]
288 +Use E<lt>fileE<gt> as configuration file. [F<@@MCONFDIR@@/munin.conf>]
292 diff -ur munin-2.0.65.orig/master/extras/munin-update_old.in munin-2.0.65/master/extras/munin-update_old.in
293 --- munin-2.0.65.orig/master/extras/munin-update_old.in 2020-10-28 22:36:02.000000000 +0100
294 +++ munin-2.0.65/master/extras/munin-update_old.in 2021-01-04 18:04:00.439803396 +0100
299 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
300 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
303 my $serversocket = "munin-server-socket.$$";
305 --host <host> Limit graphed hosts to <host>. Multiple --host options
307 --config <file> Use <file> as configuration file.
308 - [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf]
309 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
310 --[no]debug View debug messages. [--nodebug]
311 --[no]fork Don't fork one instance for each host. [--fork]
312 --timeout=<seconds> TCP timeout when talking to clients. [$timeout]
313 @@ -751,11 +751,11 @@
316 $key = $cert = munin_get ($config, "tls_pem");
317 - $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
318 + $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
320 - $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
321 + $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
322 unless defined $cert;
323 - $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem")
324 + $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem")
325 unless defined $ca_cert;
326 $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
327 $depth=&munin_get ($config, "tls_verify_depth", 5);
328 @@ -1087,7 +1087,7 @@
330 =item B<< --config <file> >>
332 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
333 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
337 @@ -1123,7 +1123,7 @@
341 - @@CONFDIR@@/munin.conf
342 + @@MCONFDIR@@/munin.conf
344 @@LOGDIR@@/munin-update
346 diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master/lib/Munin/Master/Config.pm
347 --- munin-2.0.65.orig/master/lib/Munin/Master/Config.pm 2021-01-04 18:03:15.210803396 +0100
348 +++ munin-2.0.65/master/lib/Munin/Master/Config.pm 2021-01-04 18:04:00.439803396 +0100
353 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
354 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
355 dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
359 rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
362 - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
363 - tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
364 - tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
365 + tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem",
366 + tls_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
367 + tls_private_key => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
368 tls_verify_certificate => 0,
369 tls_verify_depth => 5,
370 tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
371 diff -ur munin-2.0.65.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.65/master/lib/Munin/Master/GraphOld.pm
372 --- munin-2.0.65.orig/master/lib/Munin/Master/GraphOld.pm 2020-10-28 22:36:02.000000000 +0100
373 +++ munin-2.0.65/master/lib/Munin/Master/GraphOld.pm 2021-01-04 18:04:00.440803396 +0100
377 my $force_run_as_root = 0;
378 -my $conffile = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf";
379 +my $conffile = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf";
380 my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR;
381 # Note: Nothing by default is more convenient and elliminates code while
382 # for cgi graphing - but it breaks how munin-graph expected stuff to work.
383 diff -ur munin-2.0.65.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.65/master/lib/Munin/Master/HTMLOld.pm
384 --- munin-2.0.65.orig/master/lib/Munin/Master/HTMLOld.pm 2020-10-28 22:36:02.000000000 +0100
385 +++ munin-2.0.65/master/lib/Munin/Master/HTMLOld.pm 2021-01-04 18:04:00.440803396 +0100
387 my @times = ("day", "week", "month", "year");
390 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
391 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
396 --service <service> Compatibility. No effect.
397 --host <host> Compatibility. No effect.
398 --config <file> Use <file> as configuration file.
399 - [/etc/munin/munin.conf]
400 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
406 =item B<< --config <file> >>
408 -Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf]
409 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
417 - @@CONFDIR@@/munin.conf
418 + @@MCONFDIR@@/munin.conf
420 @@LOGDIR@@/munin-html
422 diff -ur munin-2.0.65.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.65/master/lib/Munin/Master/LimitsOld.pm
423 --- munin-2.0.65.orig/master/lib/Munin/Master/LimitsOld.pm 2020-10-28 22:36:02.000000000 +0100
424 +++ munin-2.0.65/master/lib/Munin/Master/LimitsOld.pm 2021-01-04 18:04:00.440803396 +0100
426 use Munin::Common::Defaults;
429 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
430 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
433 my @limit_hosts = ();
435 --contact <contact> Limit notified contacts to <contact>. Multiple
436 --contact options may be supplied.
437 --config <file> Use <file> as configuration file.
438 - [/etc/munin/munin.conf]
439 + [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
443 diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/lib/Munin/Master/Utils.pm
444 --- munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm 2021-01-04 18:03:15.210803396 +0100
445 +++ munin-2.0.65/master/lib/Munin/Master/Utils.pm 2021-01-04 18:04:00.440803396 +0100
450 -my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
451 +my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
453 # Fields to copy when "aliasing" a field
454 my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info");
455 diff -ur munin-2.0.65.orig/master/munin.conf.in munin-2.0.65/master/munin.conf.in
456 --- munin-2.0.65.orig/master/munin.conf.in 2021-01-04 18:03:15.210803396 +0100
457 +++ munin-2.0.65/master/munin.conf.in 2021-01-04 18:04:00.440803396 +0100
459 # cgitmpdir @@DBDIR@@/cgi-tmp
461 # (Exactly one) directory to include all files from.
462 -includedir @@CONFDIR@@/munin-conf.d
463 +includedir @@MCONFDIR@@/munin-conf.d
465 # You can choose the time reference for "DERIVE" like graphs, and show
466 # "per minute", "per hour" values instead of the default "per second"
467 diff -ur munin-2.0.65.orig/master/t/munin_master_config.t munin-2.0.65/master/t/munin_master_config.t
468 --- munin-2.0.65.orig/master/t/munin_master_config.t 2020-10-28 22:36:02.000000000 +0100
469 +++ munin-2.0.65/master/t/munin_master_config.t 2021-01-04 18:04:00.440803396 +0100
474 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
475 + config_file => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
476 dbdir => '/opt/munin/sandbox/var/opt/munin',
479 diff -ur munin-2.0.65.orig/master/www/munin-htaccess.in munin-2.0.65/master/www/munin-htaccess.in
480 --- munin-2.0.65.orig/master/www/munin-htaccess.in 2020-10-28 22:36:02.000000000 +0100
481 +++ munin-2.0.65/master/www/munin-htaccess.in 2021-01-04 18:04:00.441803396 +0100
484 # <directory @@HTMLDIR@@>
486 -AuthUserFile @@CONFDIR@@/munin-htpasswd
487 +AuthUserFile @@MCONFDIR@@/munin-htpasswd
491 diff -ur munin-2.0.65.orig/node/bin/munindoc munin-2.0.65/node/bin/munindoc
492 --- munin-2.0.65.orig/node/bin/munindoc 2020-10-28 22:36:02.000000000 +0100
493 +++ munin-2.0.65/node/bin/munindoc 2021-01-04 18:04:00.441803396 +0100
496 # Dirs in which to look for $plugin.pod and $plugin files.
497 my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
498 - "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins",
499 + "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins",
500 "$Munin::Common::Defaults::MUNIN_PERLLIB");
502 File::Find::find({wanted => \&wanted_pod}, @DIRS);
503 diff -ur munin-2.0.65.orig/node/doc/munin-node.conf.pod munin-2.0.65/node/doc/munin-node.conf.pod
504 --- munin-2.0.65.orig/node/doc/munin-node.conf.pod 2020-10-28 22:36:02.000000000 +0100
505 +++ munin-2.0.65/node/doc/munin-node.conf.pod 2021-01-04 18:04:00.441803396 +0100
507 =item B<tls_private_key> <value>
509 This directive sets the location of the private key to be used for
510 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
511 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
512 certificate can be stored in the same file.
514 =item B<tls_certificate> <value>
516 This directive sets the location of the TLS certificate to be used for
517 -TLS. Default is @@CONFDIR@@/munin-node.pem. The private key and
518 +TLS. Default is @@NCONFDIR@@/munin-node.pem. The private key and
519 certificate can be stored in the same file.
521 =item B<tls_ca_certificate> <value>
523 This directive sets the CA certificate to be used to verify the node's
524 certificate, if tls_verify_certificate is set to C<yes>. Default is
525 -@@CONFDIR@@/cacert.pem.
526 +@@NCONFDIR@@/cacert.pem.
528 =item B<tls_verify_depth> <value>
530 diff -ur munin-2.0.65.orig/node/extras/munin-node-simple.in munin-2.0.65/node/extras/munin-node-simple.in
531 --- munin-2.0.65.orig/node/extras/munin-node-simple.in 2020-10-28 22:36:02.000000000 +0100
532 +++ munin-2.0.65/node/extras/munin-node-simple.in 2021-01-04 18:04:00.517803396 +0100
537 -my $clientdir = "@@CONFDIR@@/node.d";
538 -my $conffile = "@@CONFDIR@@/node-simple.conf";
539 +my $clientdir = "@@NCONFDIR@@/node.d";
540 +my $conffile = "@@NCONFDIR@@/node-simple.conf";
541 my $version = "@@VERSION@@";
544 diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Config.pm munin-2.0.65/node/lib/Munin/Node/Config.pm
545 --- munin-2.0.65.orig/node/lib/Munin/Node/Config.pm 2020-10-28 22:36:02.000000000 +0100
546 +++ munin-2.0.65/node/lib/Munin/Node/Config.pm 2021-01-04 18:04:00.517803396 +0100
550 $instance ||= bless {
551 - config_file => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf",
552 + config_file => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf",
556 diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Server.pm munin-2.0.65/node/lib/Munin/Node/Server.pm
557 --- munin-2.0.65.orig/node/lib/Munin/Node/Server.pm 2020-10-28 22:36:02.000000000 +0100
558 +++ munin-2.0.65/node/lib/Munin/Node/Server.pm 2021-01-04 18:04:00.517803396 +0100
559 @@ -273,11 +273,11 @@
560 my $mode = $session->{tls_mode};
562 my $key = $config->{tls_private_key}
563 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
564 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
565 my $cert = $config->{tls_certificate}
566 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
567 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
568 my $ca_cert = $config->{tls_ca_certificate}
569 - || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem";
570 + || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem";
571 my $tls_verify = $config->{tls_verify_certificate}
573 my $tls_match = $config->{tls_match};
574 diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Service.pm munin-2.0.65/node/lib/Munin/Node/Service.pm
575 --- munin-2.0.65.orig/node/lib/Munin/Node/Service.pm 2020-10-28 22:36:02.000000000 +0100
576 +++ munin-2.0.65/node/lib/Munin/Node/Service.pm 2021-01-04 18:04:00.517803396 +0100
578 my ($class, %args) = @_;
581 - $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
582 + $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
584 $args{defuser} = getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER unless defined($args{defuser});
585 $args{defgroup} = getgrnam $Munin::Common::Defaults::MUNIN_GROUP unless defined($args{defgroup});
586 diff -ur munin-2.0.65.orig/node/sbin/munin-node munin-2.0.65/node/sbin/munin-node
587 --- munin-2.0.65.orig/node/sbin/munin-node 2020-10-28 22:36:02.000000000 +0100
588 +++ munin-2.0.65/node/sbin/munin-node 2021-01-04 18:04:00.517803396 +0100
590 use Munin::Node::Server;
593 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
594 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
595 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
596 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
602 =item B<< --config <configfile> >>
604 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
605 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
607 =item B< --[no]paranoia >
613 - @@CONFDIR@@/munin-node.conf
614 - @@CONFDIR@@/plugins/*
615 - @@CONFDIR@@/plugin-conf.d/*
616 + @@NCONFDIR@@/munin-node.conf
617 + @@NCONFDIR@@/plugins/*
618 + @@NCONFDIR@@/plugin-conf.d/*
619 @@STATEDIR@@/munin-node.pid
620 @@LOGDIR@@/munin-node.log
622 diff -ur munin-2.0.65.orig/node/sbin/munin-node-configure munin-2.0.65/node/sbin/munin-node-configure
623 --- munin-2.0.65.orig/node/sbin/munin-node-configure 2020-10-28 22:36:02.000000000 +0100
624 +++ munin-2.0.65/node/sbin/munin-node-configure 2021-01-04 18:04:00.518803396 +0100
629 - my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
630 - my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
631 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
632 + my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
633 + my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
634 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
635 my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
638 @@ -487,15 +487,15 @@
640 =item B<< --config <file> >>
642 -Override configuration file [@@CONFDIR@@/munin-node.conf]
643 +Override configuration file [@@NCONFDIR@@/munin-node.conf]
645 =item B<< --servicedir <dir> >>
647 -Override plugin directory [@@CONFDIR@@/plugins/]
648 +Override plugin directory [@@NCONFDIR@@/plugins/]
650 =item B<< --sconfdir <dir> >>
652 -Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]
653 +Override plugin configuration directory [@@NCONFDIR@@/plugin-conf.d/]
655 =item B<< --libdir <dir> >>
661 - @@CONFDIR@@/munin-node.conf
662 - @@CONFDIR@@/plugin-conf.d/*
663 - @@CONFDIR@@/plugins/*
664 + @@NCONFDIR@@/munin-node.conf
665 + @@NCONFDIR@@/plugin-conf.d/*
666 + @@NCONFDIR@@/plugins/*
667 @@LIBDIR@@/plugins/plugins.history
670 diff -ur munin-2.0.65.orig/node/sbin/munin-run munin-2.0.65/node/sbin/munin-run
671 --- munin-2.0.65.orig/node/sbin/munin-run 2020-10-28 22:36:02.000000000 +0100
672 +++ munin-2.0.65/node/sbin/munin-run 2021-01-04 18:04:00.518803396 +0100
677 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
678 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
685 # Default configuration values
686 - my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
687 + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
691 @@ -433,15 +433,15 @@
693 =item B<< --config <configfile> >>
695 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
696 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
698 =item B<< --servicedir <dir> >>
700 -Use E<lt>dirE<gt> as plugin dir. [@@CONFDIR@@/plugins/]
701 +Use E<lt>dirE<gt> as plugin dir. [@@NCONFDIR@@/plugins/]
703 =item B<< --sconfdir <dir> >>
705 -Use E<lt>dirE<gt> as plugin configuration dir. [@@CONFDIR@@/plugin-conf.d/]
706 +Use E<lt>dirE<gt> as plugin configuration dir. [@@NCONFDIR@@/plugin-conf.d/]
708 =item B<< --sconffile <file> >>
714 - @@CONFDIR@@/munin-node.conf
715 - @@CONFDIR@@/plugins/*
716 - @@CONFDIR@@/plugin-conf.d/*
717 + @@NCONFDIR@@/munin-node.conf
718 + @@NCONFDIR@@/plugins/*
719 + @@NCONFDIR@@/plugin-conf.d/*
720 @@STATEDIR@@/munin-node.pid
721 @@LOGDIR@@/munin-node.log
723 diff -ur munin-2.0.65.orig/plugins/node.d/exim_mailqueue.in munin-2.0.65/plugins/node.d/exim_mailqueue.in
724 --- munin-2.0.65.orig/plugins/node.d/exim_mailqueue.in 2020-10-28 22:36:02.000000000 +0100
725 +++ munin-2.0.65/plugins/node.d/exim_mailqueue.in 2021-01-04 18:04:06.350803396 +0100
730 -Configuration parameters for a file in @@CONFDIR@@/plugin-conf.d/
731 +Configuration parameters for a file in @@NCONFDIR@@/plugin-conf.d/
732 if you need to override the defaults below:
735 diff -ur munin-2.0.65.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.65/plugins/node.d/ipmi_sensor_.in
736 --- munin-2.0.65.orig/plugins/node.d/ipmi_sensor_.in 2020-10-28 22:36:02.000000000 +0100
737 +++ munin-2.0.65/plugins/node.d/ipmi_sensor_.in 2021-01-04 18:04:06.351803396 +0100
739 ipmitool probably needs to be run as root, and it may take more than
740 10 seconds on some hosts.
742 -Add the following to your @@CONFDIR@@/munin-node:
743 +Add the following to your @@NCONFDIR@@/munin-node:
751 -Plugin reads @@CONFDIR@@/ipmi directly, instead of reading environment
752 +Plugin reads @@NCONFDIR@@/ipmi directly, instead of reading environment
757 CACHEDIR = environ['MUNIN_PLUGSTATE']
758 CACHEFILE = "plugin-ipmi_sensor.cache"
760 -CONFIG = '@@CONFDIR@@/ipmi'
761 +CONFIG = '@@NCONFDIR@@/ipmi'
764 def normalize_sensor(name):
765 diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/node.d/mysql_innodb.in
766 --- munin-2.0.65.orig/plugins/node.d/mysql_innodb.in 2021-01-04 17:53:09.641969144 +0100
767 +++ munin-2.0.65/plugins/node.d/mysql_innodb.in 2021-01-04 18:04:06.351803396 +0100
772 -Configuration parameters for @@CONFDIR@@/mysql_innodb,
773 +Configuration parameters for @@NCONFDIR@@/mysql_innodb,
774 if you need to override the defaults below:
777 diff -ur munin-2.0.65.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.65/plugins/node.d/mysql_isam_space_.in
778 --- munin-2.0.65.orig/plugins/node.d/mysql_isam_space_.in 2020-10-28 22:36:02.000000000 +0100
779 +++ munin-2.0.65/plugins/node.d/mysql_isam_space_.in 2021-01-04 18:04:06.351803396 +0100
784 -Configuration parameters for @@CONFDIR@@/PLUGIN,
785 +Configuration parameters for @@NCONFDIR@@/PLUGIN,
786 if you need to override the defaults below:
789 diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/node.d/mysql_threads.in
790 --- munin-2.0.65.orig/plugins/node.d/mysql_threads.in 2021-01-04 17:53:09.641969144 +0100
791 +++ munin-2.0.65/plugins/node.d/mysql_threads.in 2021-01-04 18:04:06.351803396 +0100
796 -Configuration parameters for @@CONFDIR@@/mysql_threads, if you
797 +Configuration parameters for @@NCONFDIR@@/mysql_threads, if you
798 need to override the defaults below:
801 diff -ur munin-2.0.65.orig/plugins/node.d/named.in munin-2.0.65/plugins/node.d/named.in
802 --- munin-2.0.65.orig/plugins/node.d/named.in 2020-10-28 22:36:02.000000000 +0100
803 +++ munin-2.0.65/plugins/node.d/named.in 2021-01-04 18:04:06.351803396 +0100
808 -Configuration parameters for @@CONFDIR@@/named,
809 +Configuration parameters for @@NCONFDIR@@/named,
810 if you need to override the defaults below:
813 diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in
814 --- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 17:55:34.045969144 +0100
815 +++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 18:04:06.352803396 +0100
820 -This plugin optionally reads the file @@CONFDIR@@/ntp-freq-comp, which
821 +This plugin optionally reads the file @@NCONFDIR@@/ntp-freq-comp, which
822 should contain a number to be added to the frequency read by ntpdc.
829 -if [ -f "@@CONFDIR@@/ntp-freq-comp" ]; then
830 - fcomp=$(cat "@@CONFDIR@@/ntp-freq-comp")
831 +if [ -f "@@NCONFDIR@@/ntp-freq-comp" ]; then
832 + fcomp=$(cat "@@NCONFDIR@@/ntp-freq-comp")
836 diff -ur munin-2.0.65.orig/plugins/node.d/postfix_mailstats.in munin-2.0.65/plugins/node.d/postfix_mailstats.in
837 --- munin-2.0.65.orig/plugins/node.d/postfix_mailstats.in 2020-10-28 22:36:02.000000000 +0100
838 +++ munin-2.0.65/plugins/node.d/postfix_mailstats.in 2021-01-04 18:04:06.352803396 +0100
843 -Configuration parameters for @@CONFDIR@@/postfix_mailstats,
844 +Configuration parameters for @@NCONFDIR@@/postfix_mailstats,
845 if you need to override the defaults below:
848 diff -ur munin-2.0.65.orig/plugins/node.d/psu_.in munin-2.0.65/plugins/node.d/psu_.in
849 --- munin-2.0.65.orig/plugins/node.d/psu_.in 2020-10-28 22:36:02.000000000 +0100
850 +++ munin-2.0.65/plugins/node.d/psu_.in 2021-01-04 18:04:06.352803396 +0100
855 - ln -s @@LIBDIR@@/plugins/psu_ @@CONFDIR@@/plugins/psu_foo
856 + ln -s @@LIBDIR@@/plugins/psu_ @@NCONFDIR@@/plugins/psu_foo
858 ...will monitor the user "foo"
860 diff -ur munin-2.0.65.orig/plugins/node.d/squeezebox_.in munin-2.0.65/plugins/node.d/squeezebox_.in
861 --- munin-2.0.65.orig/plugins/node.d/squeezebox_.in 2020-10-28 22:36:02.000000000 +0100
862 +++ munin-2.0.65/plugins/node.d/squeezebox_.in 2021-01-04 18:04:06.352803396 +0100
864 non-default configuration, please use the environment variables
865 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
866 nc(1) binary is not called "nc", or not the one in $PATH, please define it
867 -in the plugin's environment file (@@CONFDIR@@/squeezebox or similar).
868 +in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar).
872 diff -ur munin-2.0.65.orig/plugins/node.d/varnish_.in munin-2.0.65/plugins/node.d/varnish_.in
873 --- munin-2.0.65.orig/plugins/node.d/varnish_.in 2020-10-28 22:36:02.000000000 +0100
874 +++ munin-2.0.65/plugins/node.d/varnish_.in 2021-01-04 18:04:06.414803396 +0100
876 You can link them yourself with something like this:
878 ln -s @@LIBDIR@@/plugins/varnish_ \
879 - @@CONFDIR@@/plugins/varnish_data_structures
880 + @@NCONFDIR@@/plugins/varnish_data_structures
882 =head1 INTERPRETATION
884 diff -ur munin-2.0.65.orig/plugins/node.d.cygwin/df.in munin-2.0.65/plugins/node.d.cygwin/df.in
885 --- munin-2.0.65.orig/plugins/node.d.cygwin/df.in 2020-10-28 22:36:02.000000000 +0100
886 +++ munin-2.0.65/plugins/node.d.cygwin/df.in 2021-01-04 18:04:06.414803396 +0100
891 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
892 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
894 The plugin excludes per default the following special, read-only or
895 dynamically allocating file systems from graphing:
896 diff -ur munin-2.0.65.orig/plugins/node.d.debug/if.in munin-2.0.65/plugins/node.d.debug/if.in
897 --- munin-2.0.65.orig/plugins/node.d.debug/if.in 2020-10-28 22:36:02.000000000 +0100
898 +++ munin-2.0.65/plugins/node.d.debug/if.in 2021-01-04 18:04:06.414803396 +0100
903 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
904 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
908 diff -ur munin-2.0.65.orig/plugins/node.d.debug/tc.in munin-2.0.65/plugins/node.d.debug/tc.in
909 --- munin-2.0.65.orig/plugins/node.d.debug/tc.in 2020-10-28 22:36:02.000000000 +0100
910 +++ munin-2.0.65/plugins/node.d.debug/tc.in 2021-01-04 18:04:06.415803396 +0100
915 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
916 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
920 diff -ur munin-2.0.65.orig/plugins/node.d.linux/acpi.in munin-2.0.65/plugins/node.d.linux/acpi.in
921 --- munin-2.0.65.orig/plugins/node.d.linux/acpi.in 2020-10-28 22:36:02.000000000 +0100
922 +++ munin-2.0.65/plugins/node.d.linux/acpi.in 2021-01-04 18:04:06.415803396 +0100
927 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
928 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
930 =head1 INTERPRETATION
932 diff -ur munin-2.0.65.orig/plugins/node.d.linux/apt.in munin-2.0.65/plugins/node.d.linux/apt.in
933 --- munin-2.0.65.orig/plugins/node.d.linux/apt.in 2020-10-28 22:36:02.000000000 +0100
934 +++ munin-2.0.65/plugins/node.d.linux/apt.in 2021-01-04 18:04:06.415803396 +0100
939 -Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node.
940 +Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node.
944 diff -ur munin-2.0.65.orig/plugins/node.d.linux/df.in munin-2.0.65/plugins/node.d.linux/df.in
945 --- munin-2.0.65.orig/plugins/node.d.linux/df.in 2020-10-28 22:36:02.000000000 +0100
946 +++ munin-2.0.65/plugins/node.d.linux/df.in 2021-01-04 18:04:06.415803396 +0100
951 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
952 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
954 You may specify filesystem specific warning and critical levels:
960 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
961 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
965 diff -ur munin-2.0.65.orig/plugins/node.d.linux/df_inode.in munin-2.0.65/plugins/node.d.linux/df_inode.in
966 --- munin-2.0.65.orig/plugins/node.d.linux/df_inode.in 2020-10-28 22:36:02.000000000 +0100
967 +++ munin-2.0.65/plugins/node.d.linux/df_inode.in 2021-01-04 18:04:06.415803396 +0100
972 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
973 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
975 You may specify filesystem specific warning and critical levels:
981 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
982 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
986 diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.65/plugins/node.d.linux/fw_conntrack.in
987 --- munin-2.0.65.orig/plugins/node.d.linux/fw_conntrack.in 2020-10-28 22:36:02.000000000 +0100
988 +++ munin-2.0.65/plugins/node.d.linux/fw_conntrack.in 2021-01-04 18:04:06.415803396 +0100
991 =head2 CONFIGURATION EXAMPLE
993 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
994 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
998 diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.65/plugins/node.d.linux/fw_forwarded_local.in
999 --- munin-2.0.65.orig/plugins/node.d.linux/fw_forwarded_local.in 2020-10-28 22:36:02.000000000 +0100
1000 +++ munin-2.0.65/plugins/node.d.linux/fw_forwarded_local.in 2021-01-04 18:04:06.426803396 +0100
1003 =head2 CONFIGURATION EXAMPLE
1005 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1006 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1010 diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_packets.in munin-2.0.65/plugins/node.d.linux/fw_packets.in
1011 --- munin-2.0.65.orig/plugins/node.d.linux/fw_packets.in 2020-10-28 22:36:02.000000000 +0100
1012 +++ munin-2.0.65/plugins/node.d.linux/fw_packets.in 2021-01-04 18:04:06.426803396 +0100
1015 =head1 CONFIGURATION EXAMPLE
1017 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1018 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1022 diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/node.d.linux/iostat.in
1023 --- munin-2.0.65.orig/plugins/node.d.linux/iostat.in 2021-01-04 17:53:09.715969144 +0100
1024 +++ munin-2.0.65/plugins/node.d.linux/iostat.in 2021-01-04 18:04:06.427803396 +0100
1029 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1030 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1032 =head1 INTERPRETATION
1034 diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.65/plugins/node.d.linux/iostat_ios.in
1035 --- munin-2.0.65.orig/plugins/node.d.linux/iostat_ios.in 2020-10-28 22:36:02.000000000 +0100
1036 +++ munin-2.0.65/plugins/node.d.linux/iostat_ios.in 2021-01-04 18:04:06.427803396 +0100
1041 -Link this into @@CONFDIR@@/plugins/ and restart the munin-node.
1042 +Link this into @@NCONFDIR@@/plugins/ and restart the munin-node.
1044 =head1 INTERPRETATION
1046 diff -ur munin-2.0.65.orig/plugins/node.d.linux/irqstats.in munin-2.0.65/plugins/node.d.linux/irqstats.in
1047 --- munin-2.0.65.orig/plugins/node.d.linux/irqstats.in 2020-10-28 22:36:02.000000000 +0100
1048 +++ munin-2.0.65/plugins/node.d.linux/irqstats.in 2021-01-04 18:04:06.427803396 +0100
1053 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1054 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1056 =head1 INTERPRETATION
1058 diff -ur munin-2.0.65.orig/resources/hpux-init.d_munin-node.in munin-2.0.65/resources/hpux-init.d_munin-node.in
1059 --- munin-2.0.65.orig/resources/hpux-init.d_munin-node.in 2020-10-28 22:36:02.000000000 +0100
1060 +++ munin-2.0.65/resources/hpux-init.d_munin-node.in 2021-01-04 18:04:06.427803396 +0100
1062 PATH=/sbin:/bin:/usr/sbin:/usr/bin
1064 DAEMON=@@SBINDIR@@/$NAME
1065 -CONFFILE=@@CONFDIR@@/munin-node.conf
1066 +CONFFILE=@@NCONFDIR@@/munin-node.conf
1067 RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
1068 PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
1069 MYCONF=/etc/rc.config.d/muninconf
1070 diff -ur munin-2.0.65.orig/resources/linux-cron.d_munin-node.in munin-2.0.65/resources/linux-cron.d_munin-node.in
1071 --- munin-2.0.65.orig/resources/linux-cron.d_munin-node.in 2020-10-28 22:36:02.000000000 +0100
1072 +++ munin-2.0.65/resources/linux-cron.d_munin-node.in 2021-01-04 18:04:06.427803396 +0100
1074 # an hour (12 invokations an hour, 1 in 12 chance that the update will
1075 # happen), but ensure that there will never be more than two hour (7200
1076 # seconds) interval between updates..
1077 -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
1078 +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
1080 diff -ur munin-2.0.65.orig/t/Makefile.config munin-2.0.65/t/Makefile.config
1081 --- munin-2.0.65.orig/t/Makefile.config 2020-10-28 22:36:02.000000000 +0100
1082 +++ munin-2.0.65/t/Makefile.config 2021-01-04 18:04:06.427803396 +0100
1084 PREFIX = $(PWD)/t/install
1086 # Where Munin keeps its configurations (server.conf, client.conf, ++)
1087 -CONFDIR = $(PREFIX)/etc
1088 +MCONFDIR = $(PREFIX)/etc
1089 +NCONFDIR = $(PREFIX)/etc
1091 # Client only - Where to put RRD files and other intenal data
1092 DBDIR = $(PREFIX)/var/lib