munin-separate-configs.patch

   1 diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm
   2 --- munin-2.0.17/common/lib/Munin/Common/Defaults.pm    2013-08-17 12:26:06.386624187 +0200
   3 +++ munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm        2013-08-17 12:19:22.386149494 +0200
   4 @@ -18,7 +18,8 @@
   5  our $DROPDOWNLIMIT     = 1;
   6
   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 Only in munin-2.0.17/common/lib/Munin/Common: Defaults.pm.orig
  15 diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/installation/configuration.rst
  16 --- munin-2.0.17/doc/installation/configuration.rst     2013-07-19 18:30:03.000000000 +0200
  17 +++ munin-2.0.17-sep/doc/installation/configuration.rst 2013-08-17 12:23:16.773630125 +0200
  18 @@ -9,7 +9,7 @@
  19  -------
  20
  21  Decide which plugins to use. The munin node runs all plugins present
  22 -in CONFDIR/plugins/
  23 +in NCONFDIR/plugins/
  24
  25  The quick auto-plug-and-play solution:
  26
  27 @@ -59,7 +59,7 @@
  28  Add some nodes
  29  --------------
  30
  31 -Add some nodes to CONFDIR/munin.conf
  32 +Add some nodes to MCONFDIR/munin.conf
  33
  34  [node.example.com]
  35    address 192.0.2.4
  36 diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  37 --- munin-2.0.17/Makefile       2013-08-17 12:26:06.386624187 +0200
  38 +++ munin-2.0.17-sep/Makefile   2013-08-17 12:19:22.386149494 +0200
  39 @@ -56,7 +56,7 @@
  40  # a new config.  Target _only_ suitable for maintainers.
  41  unconfig:
  42         rm -f $(HTMLDIR)/.htaccess
  43 -       rm -f $(CONFDIR)/munin.conf
  44 +       rm -f $(MCONFDIR)/munin.conf
  45
  46  tags:
  47         -rm -f TAGS
  48 @@ -71,14 +71,15 @@
  49         mkdir -p $(LOGDIR)
  50         mkdir -p $(STATEDIR)
  51         mkdir -p $(SPOOLDIR)
  52 -       mkdir -p $(CONFDIR)
  53 +       mkdir -p $(NCONFDIR)
  54 +       mkdir -p $(MCONFDIR)
  55         $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
  56
  57  install-master-prime: $(INFILES_MASTER) install-pre install-master
  58         mkdir -p $(TEMPLATEDIR)
  59         mkdir -p $(TEMPLATEDIR)/static
  60         mkdir -p $(TEMPLATEDIR)/partial
  61 -       mkdir -p $(CONFDIR)/munin-conf.d
  62 +       mkdir -p $(MCONFDIR)/munin-conf.d
  63         mkdir -p $(LIBDIR)
  64         mkdir -p $(BINDIR)
  65         mkdir -p $(SBINDIR)
  66 @@ -111,7 +112,7 @@
  67         $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
  68
  69         test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
  70 -       test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
  71 +       test -f "$(MCONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(MCONFDIR)/
  72
  73         $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
  74         $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
  75 @@ -140,14 +141,14 @@
  76  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
  77         @$(CHECKGROUP)
  78
  79 -       mkdir -p $(CONFDIR)/plugins
  80 -       mkdir -p $(CONFDIR)/plugin-conf.d
  81 +       mkdir -p $(NCONFDIR)/plugins
  82 +       mkdir -p $(NCONFDIR)/plugin-conf.d
  83         mkdir -p $(LIBDIR)/plugins
  84         mkdir -p $(PLUGSTATE)
  85
  86         $(CHOWN) root:root $(PLUGSTATE)
  87         $(CHMOD) 0755 $(PLUGSTATE)
  88 -       $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
  89 +       $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d
  90
  91         for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
  92             if test -f "$$p" ; then                            \
  93 @@ -184,7 +185,7 @@
  94  install-node-prime: install-node-pre install-node
  95
  96  install-node-pre: build/node/munin-node.conf install-pre
  97 -       test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
  98 +       test -f "$(NCONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(NCONFDIR)/
  99
 100
 101  install-common-prime: build-common install-common
 102 @@ -220,7 +221,8 @@
 103         @echo "$< -> $@"
 104         @mkdir -p build/`dirname $<`
 105         @sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
 106 -             -e 's|@@CONFDIR@@|$(CONFDIR)|g'                    \
 107 +             -e 's|@@MCONFDIR@@|$(MCONFDIR)|g'                  \
 108 +             -e 's|@@NCONFDIR@@|$(NCONFDIR)|g'                  \
 109               -e 's|@@BINDIR@@|$(BINDIR)|g'                      \
 110               -e 's|@@SBINDIR@@|$(SBINDIR)|g'                    \
 111               -e 's|@@DOCDIR@@|$(DOCDIR)|g'                      \
 112 @@ -261,7 +263,8 @@
 113  common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
 114         rm -f common/blib/lib/Munin/Common/Defaults.pm
 115         $(PERL) -pe 's{(PREFIX     \s+=\s).*}{\1q{$(PREFIX)};}x;   \
 116 -                  s{(CONFDIR    \s+=\s).*}{\1q{$(CONFDIR)};}x;     \
 117 +                  s{(MCONFDIR    \s+=\s).*}{\1q{$(MCONFDIR)};}x;   \
 118 +                  s{(NCONFDIR    \s+=\s).*}{\1q{$(NCONFDIR)};}x;   \
 119                    s{(BINDIR     \s+=\s).*}{\1q{$(BINDIR)};}x;      \
 120                    s{(SBINDIR    \s+=\s).*}{\1q{$(SBINDIR)};}x;     \
 121                    s{(DOCDIR     \s+=\s).*}{\1q{$(DOCDIR)};}x;      \
 122 @@ -388,7 +391,7 @@
 123         $(MAKE) $@ CONFIG=t/Makefile.config
 124  else
 125  test_plugins = id_default id_root env
 126 -old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
 127 +old-test: t/*.t t/install $(addprefix $(NCONFDIR)/plugins/,$(test_plugins))
 128         @for test in t/*.t; do \
 129                 echo -n "$$test: "; \
 130                 PERL5LIB=$(PERLLIB) $(PERL) $$test;\
 131 @@ -396,10 +399,10 @@
 132  endif
 133
 134  node-monkeywrench: install-node
 135 -       rm -rf $(CONFDIR)/plugins
 136 +       rm -rf $(NCONFDIR)/plugins
 137         rm -rf $(LIBDIR)/plugins
 138         mkdir -p $(LIBDIR)/plugins
 139 -       mkdir -p $(CONFDIR)/plugins
 140 +       mkdir -p $(NCONFDIR)/plugins
 141         cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
 142         $(SBINDIR)/munin-node-configure --suggest
 143         echo 'Done?'
 144 diff -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
 145 --- munin-2.0.17/Makefile.config        2013-08-17 12:26:06.386624187 +0200
 146 +++ munin-2.0.17-sep/Makefile.config    2013-08-17 12:19:22.386149494 +0200
 147 @@ -20,7 +20,8 @@
 148  PREFIX     = $(DESTDIR)/usr
 149
 150  # Where Munin keeps its configurations (server.conf, client.conf, ++)
 151 -CONFDIR    = $(DESTDIR)/etc/munin
 152 +NCONFDIR    = $(DESTDIR)/etc/munin
 153 +MCONFDIR    = $(DESTDIR)/etc/webapps/munin
 154
 155  # Server only - where to put munin-cron
 156  BINDIR     = $(PREFIX)/bin
 157 Only in munin-2.0.17: Makefile.config.orig
 158 Only in munin-2.0.17: Makefile.orig
 159 diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bin/munin-cgi-graph.in
 160 --- munin-2.0.17/master/_bin/munin-cgi-graph.in 2013-07-19 18:30:03.000000000 +0200
 161 +++ munin-2.0.17-sep/master/_bin/munin-cgi-graph.in     2013-08-17 12:19:22.386149494 +0200
 162 @@ -44,7 +44,7 @@
 163  use Log::Log4perl qw( :easy );
 164
 165  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
 166 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 167 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 168
 169  my %period  = ( "day"   => 300,
 170                 "week"  => 1800,
 171 diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/munin-check.in
 172 --- munin-2.0.17/master/_bin/munin-check.in     2013-07-19 18:30:03.000000000 +0200
 173 +++ munin-2.0.17-sep/master/_bin/munin-check.in 2013-08-17 12:19:22.386149494 +0200
 174 @@ -163,7 +163,7 @@
 175  norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
 176  norec=yes perm_ok @@PLUGSTATE@@ 775
 177
 178 -norec=yes perm_ok @@CONFDIR@@/plugin-conf.d 755
 179 +norec=yes perm_ok @@NCONFDIR@@/plugin-conf.d 755
 180
 181  echo "Check done.  Please note that this script only checks most things,"
 182  echo "not all things."
 183 diff -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/munin-graph.in
 184 --- munin-2.0.17/master/_bin/munin-graph.in     2013-07-19 18:30:03.000000000 +0200
 185 +++ munin-2.0.17-sep/master/_bin/munin-graph.in 2013-08-17 12:19:22.386149494 +0200
 186 @@ -51,7 +51,7 @@
 187  use Log::Log4perl qw( :easy );
 188
 189  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
 190 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 191 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 192
 193  my %period  = ( "day"   => 300,
 194                 "week"  => 1800,
 195 diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/munin-limits.in
 196 --- munin-2.0.17/master/_bin/munin-limits.in    2013-07-19 18:30:03.000000000 +0200
 197 +++ munin-2.0.17-sep/master/_bin/munin-limits.in        2013-08-17 12:19:22.386149494 +0200
 198 @@ -66,7 +66,7 @@
 199
 200  =item B<< --config <file> >>
 201
 202 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
 203 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
 204
 205  =item B<< --always-send <severity list> >>
 206
 207 @@ -114,7 +114,7 @@
 208
 209  =head1 FILES
 210
 211 -       @@CONFDIR@@/munin.conf
 212 +       @@MCONFDIR@@/munin.conf
 213         @@DBDIR@@/*
 214         @@STATEDIR@@/*
 215
 216 diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/munin-update.in
 217 --- munin-2.0.17/master/_bin/munin-update.in    2013-07-19 18:30:03.000000000 +0200
 218 +++ munin-2.0.17-sep/master/_bin/munin-update.in        2013-08-17 12:19:22.386149494 +0200
 219 @@ -139,7 +139,7 @@
 220
 221  =item B<< --config_file=<file> >>
 222
 223 -Use E<lt>fileE<gt> as the configuration file. [@@CONFDIR@@/munin.conf]
 224 +Use E<lt>fileE<gt> as the configuration file. [@@MCONFDIR@@/munin.conf]
 225
 226  =item B<< --[no]debug >>
 227
 228 @@ -192,7 +192,7 @@
 229
 230  =head1 FILES
 231
 232 -       @@CONFDIR@@/munin.conf
 233 +       @@MCONFDIR@@/munin.conf
 234         @@DBDIR@@/*
 235         @@LOGDIR@@/munin-update
 236         @@STATEDIR@@/*
 237 diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/munin.conf.pod.in
 238 --- munin-2.0.17/master/doc/munin.conf.pod.in   2013-08-17 12:26:06.386624187 +0200
 239 +++ munin-2.0.17-sep/master/doc/munin.conf.pod.in       2013-08-17 12:19:22.386149494 +0200
 240 @@ -27,7 +27,7 @@
 241         [machine1.your.dom]
 242                 address localhost
 243
 244 -The default location of F<munin.conf> is F<@@CONFDIR@@/munin.conf>.
 245 +The default location of F<munin.conf> is F<@@MCONFDIR@@/munin.conf>.
 246  If your placement deviates from this norm, use the "--config
 247  E<lt>fileE<gt>"-option when running the munin-* programs.
 248
 249 @@ -149,20 +149,20 @@
 250  =item B<tls_private_key> <value>
 251
 252  This directive sets the location of the private key to be used for
 253 -TLS.  Default is @@CONFDIR@@/munin.pem.  The private key and
 254 +TLS.  Default is @@MCONFDIR@@/munin.pem.  The private key and
 255  certificate can be stored in the same file.  Affects: munin-update.
 256
 257  =item B<tls_certificate> <value>
 258
 259  This directive sets the location of the TLS certificate 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.
 263
 264  =item B<tls_ca_certificate> <value>
 265
 266  This directive sets the CA certificate to be used to verify the node's
 267  certificate, if tls_verify_certificate is set to C<yes>.  Default is
 268 -@@CONFDIR@@/cacert.pem.  Affects: munin-update.
 269 +@@MCONFDIR@@/cacert.pem.  Affects: munin-update.
 270
 271  =item B<tls_verify_depth> <value>
 272
 273 Only in munin-2.0.17/master/doc: munin.conf.pod.in.orig
 274 diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/munin-cron.pod.in
 275 --- munin-2.0.17/master/doc/munin-cron.pod.in   2013-07-19 18:30:03.000000000 +0200
 276 +++ munin-2.0.17-sep/master/doc/munin-cron.pod.in       2013-08-17 12:19:22.386149494 +0200
 277 @@ -22,7 +22,7 @@
 278
 279  =item B<< --config <file> >>
 280
 281 -Use E<lt>fileE<gt> as configuration file. [F<@@CONFDIR@@/munin.conf>]
 282 +Use E<lt>fileE<gt> as configuration file. [F<@@MCONFDIR@@/munin.conf>]
 283
 284  =back
 285
 286 diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/extras/munin-update_old.in
 287 --- munin-2.0.17/master/extras/munin-update_old.in      2013-07-19 18:30:03.000000000 +0200
 288 +++ munin-2.0.17-sep/master/extras/munin-update_old.in  2013-08-17 12:19:22.386149494 +0200
 289 @@ -43,7 +43,7 @@
 290  my $STATS;
 291  my $cli_do_fork;
 292  my $cli_timeout;
 293 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 294 +my $conffile = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 295  my $config;
 296  my $do_fork = 1;
 297  my $serversocket  = "munin-server-socket.$$";
 298 @@ -159,7 +159,7 @@
 299      --host <host>      Limit graphed hosts to <host>. Multiple --host options
 300                         may be supplied.
 301      --config <file>    Use <file> as configuration file.
 302 -                       [$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf]
 303 +                       [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
 304      --[no]debug                View debug messages. [--nodebug]
 305      --[no]fork         Don't fork one instance for each host. [--fork]
 306      --timeout=<seconds>        TCP timeout when talking to clients. [$timeout]
 307 @@ -752,11 +752,11 @@
 308         my $ca_cert;
 309         my $tls_verify;
 310          $key = $cert = munin_get ($config, "tls_pem");
 311 -        $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
 312 +        $key = &munin_get ($config, "tls_private_key", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
 313           unless defined $key;
 314 -        $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem")
 315 +        $cert = &munin_get ($config, "tls_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem")
 316           unless defined $cert;
 317 -        $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem")
 318 +        $ca_cert = &munin_get ($config, "tls_ca_certificate", "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem")
 319             unless defined $ca_cert;
 320          $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
 321          $depth=&munin_get ($config, "tls_verify_depth", 5);
 322 @@ -1088,7 +1088,7 @@
 323
 324  =item B<< --config <file> >>
 325
 326 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin.conf]
 327 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
 328
 329  =item B<< --help >>
 330
 331 @@ -1124,7 +1124,7 @@
 332
 333  =head1 FILES
 334
 335 -       @@CONFDIR@@/munin.conf
 336 +       @@MCONFDIR@@/munin.conf
 337         @@DBDIR@@/*
 338         @@LOGDIR@@/munin-update
 339         @@STATEDIR@@/*
 340 diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/lib/Munin/Master/Config.pm
 341 --- munin-2.0.17/master/lib/Munin/Master/Config.pm      2013-08-17 12:26:06.476625774 +0200
 342 +++ munin-2.0.17-sep/master/lib/Munin/Master/Config.pm  2013-08-17 12:19:22.386149494 +0200
 343 @@ -139,7 +139,7 @@
 344             root_instance => 1,
 345
 346             config      => bless ( {
 347 -               config_file      => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
 348 +               config_file      => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
 349                 dbdir            => $Munin::Common::Defaults::MUNIN_DBDIR,
 350                 debug            => 0,
 351                 fork             => 1,
 352 @@ -153,9 +153,9 @@
 353                 rundir           => $Munin::Common::Defaults::MUNIN_STATEDIR,
 354                 timeout          => 180,
 355                 tls              => 'disabled',
 356 -               tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
 357 -               tls_certificate  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
 358 -               tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
 359 +               tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_MCONFDIR/cacert.pem",
 360 +               tls_certificate  => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
 361 +               tls_private_key  => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.pem",
 362                 tls_verify_certificate => 0,
 363                 tls_verify_depth => 5,
 364                 tmpldir          => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
 365 Only in munin-2.0.17/master/lib/Munin/Master: Config.pm.orig
 366 diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm
 367 --- munin-2.0.17/master/lib/Munin/Master/GraphOld.pm    2013-07-19 18:30:03.000000000 +0200
 368 +++ munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm        2013-08-17 12:19:22.386149494 +0200
 369 @@ -90,7 +90,7 @@
 370  my $skip_stats     = 0;
 371  my $stdout         = 0;
 372  my $force_run_as_root = 0;
 373 -my $conffile       = $Munin::Common::Defaults::MUNIN_CONFDIR . "/munin.conf";
 374 +my $conffile       = $Munin::Common::Defaults::MUNIN_MCONFDIR . "/munin.conf";
 375  my $libdir         = $Munin::Common::Defaults::MUNIN_LIBDIR;
 376  # Note: Nothing by default is more convenient and elliminates code while
 377  # for cgi graphing - but it breaks how munin-graph expected stuff to work.
 378 diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm
 379 --- munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm     2013-07-19 18:30:03.000000000 +0200
 380 +++ munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm 2013-08-17 12:19:22.389482886 +0200
 381 @@ -81,7 +81,7 @@
 382  my @times = ("day", "week", "month", "year");
 383
 384  my $DEBUG      = 0;
 385 -my $conffile   = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 386 +my $conffile   = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 387  my $do_usage   = 0;
 388  my $do_version = 0;
 389  my $stdout     = 0;
 390 @@ -857,7 +857,7 @@
 391      --service <service>        Compatibility. No effect.
 392      --host <host>      Compatibility. No effect.
 393      --config <file>    Use <file> as configuration file.
 394 -                       [/etc/munin/munin.conf]
 395 +                       [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
 396
 397  ";
 398      exit 0;
 399 @@ -892,7 +892,7 @@
 400
 401  =item B<< --config <file> >>
 402
 403 -Use E<lt>fileE<gt> as configuration file. [/etc/munin/munin.conf]
 404 +Use E<lt>fileE<gt> as configuration file. [@@MCONFDIR@@/munin.conf]
 405
 406  =item B<< --help >>
 407
 408 @@ -915,7 +915,7 @@
 409
 410  =head1 FILES
 411
 412 -       @@CONFDIR@@/munin.conf
 413 +       @@MCONFDIR@@/munin.conf
 414         @@DBDIR@@/datafile
 415         @@LOGDIR@@/munin-html
 416         @@HTMLDIR@@/*
 417 diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm
 418 --- munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm   2013-07-19 18:30:03.000000000 +0200
 419 +++ munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm       2013-08-17 12:19:22.389482886 +0200
 420 @@ -52,7 +52,7 @@
 421  use Munin::Common::Defaults;
 422
 423  my $DEBUG          = 0;
 424 -my $conffile       = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 425 +my $conffile       = "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 426  my $do_usage       = 0;
 427  my $do_version     = 0;
 428  my @limit_hosts    = ();
 429 @@ -230,7 +230,7 @@
 430      --contact <contact>        Limit notified contacts to <contact>. Multiple
 431                         --contact options may be supplied.
 432      --config <file>    Use <file> as configuration file.
 433 -                       [/etc/munin/munin.conf]
 434 +                       [$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf]
 435
 436  ";
 437      exit 0;
 438 Only in munin-2.0.17/master/lib/Munin/Master: Node.pm.orig
 439 diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm
 440 --- munin-2.0.17/master/lib/Munin/Master/Utils.pm       2013-08-17 12:26:06.476625774 +0200
 441 +++ munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm   2013-08-17 12:19:22.389482886 +0200
 442 @@ -115,7 +115,7 @@
 443         },
 444  };
 445
 446 -my $configfile="$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 447 +my $configfile="$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf";
 448
 449  # Fields to copy when "aliasing" a field
 450  my @COPY_FIELDS    = ("label", "draw", "type", "rrdfile", "fieldname", "info");
 451 Only in munin-2.0.17/master/lib/Munin/Master: Utils.pm.orig
 452 diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
 453 --- munin-2.0.17/master/munin.conf.in   2013-08-17 12:26:06.476625774 +0200
 454 +++ munin-2.0.17-sep/master/munin.conf.in       2013-08-17 12:19:22.389482886 +0200
 455 @@ -24,7 +24,7 @@
 456  # cgitmpdir @@DBDIR@@/cgi-tmp
 457
 458  # (Exactly one) directory to include all files from.
 459 -includedir @@CONFDIR@@/munin-conf.d
 460 +includedir @@MCONFDIR@@/munin-conf.d
 461
 462  # You can choose the time reference for "DERIVE" like graphs, and show
 463  # "per minute", "per hour" values instead of the default "per second"
 464 Only in munin-2.0.17/master: munin.conf.in.orig
 465 diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/munin_master_config.t
 466 --- munin-2.0.17/master/t/munin_master_config.t 2013-07-19 18:30:03.000000000 +0200
 467 +++ munin-2.0.17-sep/master/t/munin_master_config.t     2013-08-17 12:23:31.933897977 +0200
 468 @@ -24,7 +24,7 @@
 469      },
 470
 471      config => {
 472 -        config_file     => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf",
 473 +        config_file     => "$Munin::Common::Defaults::MUNIN_MCONFDIR/munin.conf",
 474          dbdir           => '/opt/munin/sandbox/var/opt/munin',
 475          debug           => 0,
 476          fork            => 1,
 477 diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/munin-htaccess.in
 478 --- munin-2.0.17/master/www/munin-htaccess.in   2013-07-19 18:30:03.000000000 +0200
 479 +++ munin-2.0.17-sep/master/www/munin-htaccess.in       2013-08-17 12:19:22.389482886 +0200
 480 @@ -9,7 +9,7 @@
 481  #
 482  # <directory @@HTMLDIR@@>
 483
 484 -AuthUserFile @@CONFDIR@@/munin-htpasswd
 485 +AuthUserFile @@MCONFDIR@@/munin-htpasswd
 486  AuthName "Munin"
 487  AuthType Basic
 488  require valid-user
 489 diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/node/bin/munindoc
 490 --- munin-2.0.17/node/bin/munindoc      2013-07-19 18:30:03.000000000 +0200
 491 +++ munin-2.0.17-sep/node/bin/munindoc  2013-08-17 12:19:22.389482886 +0200
 492 @@ -48,7 +48,7 @@
 493
 494  # Dirs in which to look for $plugin.pod and $plugin files.
 495  my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
 496 -           "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins",
 497 +           "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins",
 498              "$Munin::Common::Defaults::MUNIN_PERLLIB");
 499
 500  File::Find::find({wanted => \&wanted_pod}, @DIRS);
 501 diff -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/munin-node.conf.pod
 502 --- munin-2.0.17/node/doc/munin-node.conf.pod   2013-07-19 18:30:03.000000000 +0200
 503 +++ munin-2.0.17-sep/node/doc/munin-node.conf.pod       2013-08-17 12:24:04.784478220 +0200
 504 @@ -91,20 +91,20 @@
 505  =item B<tls_private_key> <value>
 506
 507  This directive sets the location of the private key to be used for
 508 -TLS.  Default is @@CONFDIR@@/munin-node.pem.  The private key and
 509 +TLS.  Default is @@NCONFDIR@@/munin-node.pem.  The private key and
 510  certificate can be stored in the same file.
 511
 512  =item B<tls_certificate> <value>
 513
 514  This directive sets the location of the TLS certificate to be used for
 515 -TLS.  Default is @@CONFDIR@@/munin-node.pem.  The private key and
 516 +TLS.  Default is @@NCONFDIR@@/munin-node.pem.  The private key and
 517  certificate can be stored in the same file.
 518
 519  =item B<tls_ca_certificate> <value>
 520
 521  This directive sets the CA certificate to be used to verify the node's
 522  certificate, if tls_verify_certificate is set to C<yes>.  Default is
 523 -@@CONFDIR@@/cacert.pem.
 524 +@@NCONFDIR@@/cacert.pem.
 525
 526  =item B<tls_verify_depth> <value>
 527
 528 diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/extras/munin-node-simple.in
 529 --- munin-2.0.17/node/extras/munin-node-simple.in       2013-07-19 18:30:03.000000000 +0200
 530 +++ munin-2.0.17-sep/node/extras/munin-node-simple.in   2013-08-17 12:19:22.389482886 +0200
 531 @@ -28,8 +28,8 @@
 532
 533  $| = 1;
 534
 535 -my $clientdir = "@@CONFDIR@@/node.d";
 536 -my $conffile  = "@@CONFDIR@@/node-simple.conf";
 537 +my $clientdir = "@@NCONFDIR@@/node.d";
 538 +my $conffile  = "@@NCONFDIR@@/node-simple.conf";
 539  my $version   = "@@VERSION@@";
 540
 541  # Empty environment
 542 diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Munin/Node/Config.pm
 543 --- munin-2.0.17/node/lib/Munin/Node/Config.pm  2013-07-19 18:30:03.000000000 +0200
 544 +++ munin-2.0.17-sep/node/lib/Munin/Node/Config.pm      2013-08-17 12:19:22.389482886 +0200
 545 @@ -25,7 +25,7 @@
 546          my ($class) = @_;
 547
 548          $instance ||= bless {
 549 -            config_file  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf",
 550 +            config_file  => "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf",
 551          }, $class;
 552
 553          return $instance;
 554 diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Munin/Node/Server.pm
 555 --- munin-2.0.17/node/lib/Munin/Node/Server.pm  2013-07-19 18:30:03.000000000 +0200
 556 +++ munin-2.0.17-sep/node/lib/Munin/Node/Server.pm      2013-08-17 12:19:22.389482886 +0200
 557 @@ -263,11 +263,11 @@
 558      my $mode = $session->{tls_mode};
 559
 560      my $key        = $config->{tls_private_key}
 561 -                  || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
 562 +                  || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
 563      my $cert       = $config->{tls_certificate}
 564 -                  || "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.pem";
 565 +                  || "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.pem";
 566      my $ca_cert    = $config->{tls_ca_certificate}
 567 -                  || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem";
 568 +                  || "$Munin::Common::Defaults::MUNIN_NCONFDIR/cacert.pem";
 569      my $tls_verify = $config->{tls_verify_certificate}
 570                    || 0;
 571      my $tls_match  = $config->{tls_match};
 572 diff -ur munin-2.0.17/node/lib/Munin/Node/Service.pm munin-2.0.17-sep/node/lib/Munin/Node/Service.pm
 573 --- munin-2.0.17/node/lib/Munin/Node/Service.pm 2013-07-19 18:30:03.000000000 +0200
 574 +++ munin-2.0.17-sep/node/lib/Munin/Node/Service.pm     2013-08-17 12:24:22.264786886 +0200
 575 @@ -22,7 +22,7 @@
 576      my ($class, %args) = @_;
 577
 578      # Set defaults
 579 -    $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
 580 +    $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
 581
 582      $args{defuser}  ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
 583      $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
 584 diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
 585 --- munin-2.0.17/node/sbin/munin-node   2013-07-19 18:30:03.000000000 +0200
 586 +++ munin-2.0.17-sep/node/sbin/munin-node       2013-08-17 12:19:22.389482886 +0200
 587 @@ -36,8 +36,8 @@
 588  use Munin::Node::Server;
 589
 590  my $servicedir;
 591 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
 592 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
 593 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
 594 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
 595  my $DEBUG    = 0;
 596  my $PIDEBUG  = 0;
 597  my $paranoia = 0;
 598 @@ -164,7 +164,7 @@
 599
 600  =item B<< --config <configfile> >>
 601
 602 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
 603 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
 604
 605  =item B< --[no]paranoia >
 606
 607 @@ -187,9 +187,9 @@
 608
 609  =head1 FILES
 610
 611 -    @@CONFDIR@@/munin-node.conf
 612 -    @@CONFDIR@@/plugins/*
 613 -    @@CONFDIR@@/plugin-conf.d/*
 614 +    @@NCONFDIR@@/munin-node.conf
 615 +    @@NCONFDIR@@/plugins/*
 616 +    @@NCONFDIR@@/plugin-conf.d/*
 617      @@STATEDIR@@/munin-node.pid
 618      @@LOGDIR@@/munin-node.log
 619
 620 diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/munin-node-configure
 621 --- munin-2.0.17/node/sbin/munin-node-configure 2013-07-19 18:30:03.000000000 +0200
 622 +++ munin-2.0.17-sep/node/sbin/munin-node-configure     2013-08-17 12:19:22.489484658 +0200
 623 @@ -76,9 +76,9 @@
 624
 625  sub parse_args
 626  {
 627 -       my $conffile   = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
 628 -       my $servicedir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
 629 -       my $sconfdir   = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
 630 +       my $conffile   = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
 631 +       my $servicedir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
 632 +       my $sconfdir   = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
 633         my $libdir     = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
 634
 635         my $debug = 0;
 636 @@ -492,15 +492,15 @@
 637
 638  =item B<< --config <file> >>
 639
 640 -Override configuration file [@@CONFDIR@@/munin-node.conf]
 641 +Override configuration file [@@NCONFDIR@@/munin-node.conf]
 642
 643  =item B<< --servicedir <dir> >>
 644
 645 -Override plugin directory [@@CONFDIR@@/plugins/]
 646 +Override plugin directory [@@NCONFDIR@@/plugins/]
 647
 648  =item B<< --sconfdir <dir> >>
 649
 650 -Override plugin configuration directory [@@CONFDIR@@/plugin-conf.d/]
 651 +Override plugin configuration directory [@@NCONFDIR@@/plugin-conf.d/]
 652
 653  =item B<< --libdir <dir> >>
 654
 655 @@ -648,9 +648,9 @@
 656
 657  =head1 FILES
 658
 659 -    @@CONFDIR@@/munin-node.conf
 660 -    @@CONFDIR@@/plugin-conf.d/*
 661 -    @@CONFDIR@@/plugins/*
 662 +    @@NCONFDIR@@/munin-node.conf
 663 +    @@NCONFDIR@@/plugin-conf.d/*
 664 +    @@NCONFDIR@@/plugins/*
 665      @@LIBDIR@@/plugins/plugins.history
 666      @@LIBDIR@@/plugins/*
 667
 668 diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
 669 --- munin-2.0.17/node/sbin/munin-run    2013-07-19 18:30:03.000000000 +0200
 670 +++ munin-2.0.17-sep/node/sbin/munin-run        2013-08-17 12:19:22.489484658 +0200
 671 @@ -35,7 +35,7 @@
 672
 673  my $services;
 674  my $servicedir;
 675 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
 676 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
 677  my $DEBUG    = 0;
 678  my $PIDEBUG  = 0;
 679  my $paranoia = 0;
 680 @@ -98,7 +98,7 @@
 681  sub parse_args
 682  {
 683      # Default configuration values
 684 -    my $sconfdir   = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
 685 +    my $sconfdir   = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
 686      my $sconffile;
 687
 688      my ($plugin, $arg);
 689 @@ -189,15 +189,15 @@
 690
 691  =item B<< --config <configfile> >>
 692
 693 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
 694 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
 695
 696  =item B<< --servicedir <dir> >>
 697
 698 -Use E<lt>dirE<gt> as plugin dir. [@@CONFDIR@@/plugins/]
 699 +Use E<lt>dirE<gt> as plugin dir. [@@NCONFDIR@@/plugins/]
 700
 701  =item B<< --sconfdir <dir> >>
 702
 703 -Use E<lt>dirE<gt> as plugin configuration dir. [@@CONFDIR@@/plugin-conf.d/]
 704 +Use E<lt>dirE<gt> as plugin configuration dir. [@@NCONFDIR@@/plugin-conf.d/]
 705
 706  =item B<< --sconffile <file> >>
 707
 708 @@ -230,9 +230,9 @@
 709
 710  =head1 FILES
 711
 712 -    @@CONFDIR@@/munin-node.conf
 713 -    @@CONFDIR@@/plugins/*
 714 -    @@CONFDIR@@/plugin-conf.d/*
 715 +    @@NCONFDIR@@/munin-node.conf
 716 +    @@NCONFDIR@@/plugins/*
 717 +    @@NCONFDIR@@/plugin-conf.d/*
 718      @@STATEDIR@@/munin-node.pid
 719      @@LOGDIR@@/munin-node.log
 720
 721 diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sched
 722 --- munin-2.0.17/node/sbin/munin-sched  2013-07-19 18:30:03.000000000 +0200
 723 +++ munin-2.0.17-sep/node/sbin/munin-sched      2013-08-17 12:24:54.562023692 +0200
 724 @@ -34,8 +34,8 @@
 725  use Munin::Node::ProxySpooler;
 726
 727  my $servicedir;
 728 -my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
 729 -my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
 730 +my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
 731 +my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
 732  my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
 733
 734  my ($host, $port);
 735 @@ -164,7 +164,7 @@
 736
 737  =item B<< --config <configfile> >>
 738
 739 -Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
 740 +Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
 741
 742  =item B< --[no]paranoia >
 743
 744 @@ -182,9 +182,9 @@
 745
 746  =head1 FILES
 747
 748 -    @@CONFDIR@@/munin-node.conf
 749 -    @@CONFDIR@@/plugins/*
 750 -    @@CONFDIR@@/plugin-conf.d/*
 751 +    @@NCONFDIR@@/munin-node.conf
 752 +    @@NCONFDIR@@/plugins/*
 753 +    @@NCONFDIR@@/plugin-conf.d/*
 754      @@STATEDIR@@/munin-sched.pid
 755      @@LOGDIR@@/munin-sched.log
 756
 757 diff -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in
 758 --- munin-2.0.17/plugins/node.d/exim_mailqueue.in       2013-07-19 18:30:03.000000000 +0200
 759 +++ munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in   2013-08-17 12:19:22.489484658 +0200
 760 @@ -15,7 +15,7 @@
 761    [exim_*]
 762      user exim
 763
 764 -Configuration parameters for a file in @@CONFDIR@@/plugin-conf.d/
 765 +Configuration parameters for a file in @@NCONFDIR@@/plugin-conf.d/
 766  if you need to override the defaults below:
 767
 768    [exim_mailqueue]
 769 diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in
 770 --- munin-2.0.17/plugins/node.d/ipmi_sensor_.in 2013-07-19 18:30:03.000000000 +0200
 771 +++ munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in     2013-08-17 12:19:22.489484658 +0200
 772 @@ -17,7 +17,7 @@
 773  ipmitool probably needs to be run as root, and it may take more than
 774  10 seconds on some hosts.
 775
 776 -Add the following to your @@CONFDIR@@/munin-node:
 777 +Add the following to your @@NCONFDIR@@/munin-node:
 778
 779   [ipmi_sensor_*]
 780    user root
 781 @@ -49,7 +49,7 @@
 782
 783  =head1 BUGS
 784
 785 -Plugin reads @@CONFDIR@@/ipmi directly, instead of reading environment
 786 +Plugin reads @@NCONFDIR@@/ipmi directly, instead of reading environment
 787  variables.
 788
 789  =head1 MAGIC MARKERS
 790 @@ -72,7 +72,7 @@
 791  CACHEDIR = os.environ['MUNIN_PLUGSTATE']
 792  CACHEFILE = "plugin-ipmi_sensor.cache"
 793  CACHEAGE = 120
 794 -CONFIG = '@@CONFDIR@@/ipmi'
 795 +CONFIG = '@@NCONFDIR@@/ipmi'
 796
 797
 798
 799 diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/node.d/mysql_innodb.in
 800 --- munin-2.0.17/plugins/node.d/mysql_innodb.in 2013-07-19 18:30:03.000000000 +0200
 801 +++ munin-2.0.17-sep/plugins/node.d/mysql_innodb.in     2013-08-17 12:19:22.489484658 +0200
 802 @@ -34,7 +34,7 @@
 803
 804  =head1 CONFIGURATION
 805
 806 -Configuration parameters for @@CONFDIR@@/mysql_innodb,
 807 +Configuration parameters for @@NCONFDIR@@/mysql_innodb,
 808  if you need to override the defaults below:
 809
 810   [mysql_innodb]
 811 diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in
 812 --- munin-2.0.17/plugins/node.d/mysql_isam_space_.in    2013-07-19 18:30:03.000000000 +0200
 813 +++ munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in        2013-08-17 12:19:22.489484658 +0200
 814 @@ -8,7 +8,7 @@
 815
 816  =head1 CONFIGURATION
 817
 818 -Configuration parameters for @@CONFDIR@@/PLUGIN,
 819 +Configuration parameters for @@NCONFDIR@@/PLUGIN,
 820  if you need to override the defaults below:
 821
 822   [mysql_isam_space_*]
 823 diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/node.d/mysql_threads.in
 824 --- munin-2.0.17/plugins/node.d/mysql_threads.in        2013-07-19 18:30:03.000000000 +0200
 825 +++ munin-2.0.17-sep/plugins/node.d/mysql_threads.in    2013-08-17 12:19:22.489484658 +0200
 826 @@ -9,7 +9,7 @@
 827
 828  =head1 CONFIGURATION
 829
 830 -Configuration parameters for @@CONFDIR@@/mysql_threads, if you
 831 +Configuration parameters for @@NCONFDIR@@/mysql_threads, if you
 832  need to override the defaults below:
 833
 834   [mysql_threads]
 835 diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/named.in
 836 --- munin-2.0.17/plugins/node.d/named.in        2013-07-19 18:30:03.000000000 +0200
 837 +++ munin-2.0.17-sep/plugins/node.d/named.in    2013-08-17 12:19:22.489484658 +0200
 838 @@ -34,7 +34,7 @@
 839
 840  =head1 CONFIGURATION
 841
 842 -Configuration parameters for @@CONFDIR@@/named,
 843 +Configuration parameters for @@NCONFDIR@@/named,
 844  if you need to override the defaults below:
 845
 846   [named]
 847 diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in
 848 --- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in  2013-07-19 18:30:03.000000000 +0200
 849 +++ munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in      2013-08-17 12:19:22.489484658 +0200
 850 @@ -12,7 +12,7 @@
 851
 852  No configuration
 853
 854 -This plugin optionally reads the file @@CONFDIR@@/ntp-freq-comp, which
 855 +This plugin optionally reads the file @@NCONFDIR@@/ntp-freq-comp, which
 856  should contain a number to be added to the frequency read by ntpdc.
 857
 858  =head1 AUTHORS
 859 @@ -46,8 +46,8 @@
 860      exit 0
 861  fi
 862
 863 -if [ -f @@CONFDIR@@/ntp-freq-comp ]; then
 864 -    fcomp=`cat @@CONFDIR@@/ntp-freq-comp`
 865 +if [ -f @@NCONFDIR@@/ntp-freq-comp ]; then
 866 +    fcomp=`cat @@NCONFDIR@@/ntp-freq-comp`
 867  else
 868      fcomp=0
 869  fi
 870 diff -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in
 871 --- munin-2.0.17/plugins/node.d/postfix_mailstats.in    2013-07-19 18:30:03.000000000 +0200
 872 +++ munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in        2013-08-17 12:19:22.489484658 +0200
 873 @@ -8,7 +8,7 @@
 874
 875  =head1 CONFIGURATION
 876
 877 -Configuration parameters for @@CONFDIR@@/postfix_mailstats,
 878 +Configuration parameters for @@NCONFDIR@@/postfix_mailstats,
 879  if you need to override the defaults below:
 880
 881   [postfix_mailstats]
 882 diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu_.in
 883 --- munin-2.0.17/plugins/node.d/psu_.in 2013-07-19 18:30:03.000000000 +0200
 884 +++ munin-2.0.17-sep/plugins/node.d/psu_.in     2013-08-17 12:19:22.489484658 +0200
 885 @@ -15,7 +15,7 @@
 886
 887  Example:
 888
 889 - ln -s @@LIBDIR@@/plugins/psu_ @@CONFDIR@@/plugins/psu_foo
 890 + ln -s @@LIBDIR@@/plugins/psu_ @@NCONFDIR@@/plugins/psu_foo
 891
 892  ...will monitor the user "foo"
 893
 894 diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/node.d/squeezebox_.in
 895 --- munin-2.0.17/plugins/node.d/squeezebox_.in  2013-07-19 18:30:03.000000000 +0200
 896 +++ munin-2.0.17-sep/plugins/node.d/squeezebox_.in      2013-08-17 12:19:22.489484658 +0200
 897 @@ -20,7 +20,7 @@
 898  non-default configuration, please use the environment variables
 899  'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
 900  nc(1) binary is not called "nc", or not the one in $PATH, please define it
 901 -in the plugin's environment file (@@CONFDIR@@/squeezebox or similar).
 902 +in the plugin's environment file (@@NCONFDIR@@/squeezebox or similar).
 903
 904  Sample follows:
 905
 906 diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d/varnish_.in
 907 --- munin-2.0.17/plugins/node.d/varnish_.in     2013-07-19 18:30:03.000000000 +0200
 908 +++ munin-2.0.17-sep/plugins/node.d/varnish_.in 2013-08-17 12:19:22.492818051 +0200
 909 @@ -54,7 +54,7 @@
 910  You can link them yourself with something like this:
 911
 912    ln -s @@LIBDIR@@/plugins/varnish_ \
 913 -    @@CONFDIR@@/plugins/varnish_data_structures
 914 +    @@NCONFDIR@@/plugins/varnish_data_structures
 915
 916  =head1 INTERPRETATION
 917
 918 diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.d.cygwin/df.in
 919 --- munin-2.0.17/plugins/node.d.cygwin/df.in    2013-07-19 18:30:03.000000000 +0200
 920 +++ munin-2.0.17-sep/plugins/node.d.cygwin/df.in        2013-08-17 12:25:08.005594281 +0200
 921 @@ -13,7 +13,7 @@
 922
 923  =head1 USAGE
 924
 925 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
 926 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
 927
 928  The plugin excludes per default the following special, read-only or
 929  dynamically allocating file systems from graphing:
 930 diff -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d.debug/if.in
 931 --- munin-2.0.17/plugins/node.d.debug/if.in     2013-07-19 18:30:03.000000000 +0200
 932 +++ munin-2.0.17-sep/plugins/node.d.debug/if.in 2013-08-17 12:25:17.379093018 +0200
 933 @@ -21,7 +21,7 @@
 934
 935  =head1 USAGE
 936
 937 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
 938 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
 939
 940  =head1 MAGIC MARKERS
 941
 942 diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d.debug/tc.in
 943 --- munin-2.0.17/plugins/node.d.debug/tc.in     2013-07-19 18:30:03.000000000 +0200
 944 +++ munin-2.0.17-sep/plugins/node.d.debug/tc.in 2013-08-17 12:25:26.375918427 +0200
 945 @@ -21,7 +21,7 @@
 946
 947  =head1 USAGE
 948
 949 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
 950 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
 951
 952  =head1 MAGIC MARKERS
 953
 954 diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node.d.linux/acpi.in
 955 --- munin-2.0.17/plugins/node.d.linux/acpi.in   2013-07-19 18:30:03.000000000 +0200
 956 +++ munin-2.0.17-sep/plugins/node.d.linux/acpi.in       2013-08-17 12:19:22.492818051 +0200
 957 @@ -17,7 +17,7 @@
 958
 959  =head1 USAGE
 960
 961 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
 962 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
 963
 964  =head1 INTERPRETATION
 965
 966 diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.d.linux/apt.in
 967 --- munin-2.0.17/plugins/node.d.linux/apt.in    2013-07-19 18:30:03.000000000 +0200
 968 +++ munin-2.0.17-sep/plugins/node.d.linux/apt.in        2013-08-17 12:19:22.492818051 +0200
 969 @@ -38,7 +38,7 @@
 970
 971  =head1 USAGE
 972
 973 -Link this plugin in @@CONFDIR@@/plugins/ and restart the munin-node.
 974 +Link this plugin in @@NCONFDIR@@/plugins/ and restart the munin-node.
 975
 976  =head1 NOTES
 977
 978 diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d.linux/df.in
 979 --- munin-2.0.17/plugins/node.d.linux/df.in     2013-07-19 18:30:03.000000000 +0200
 980 +++ munin-2.0.17-sep/plugins/node.d.linux/df.in 2013-08-17 12:19:22.492818051 +0200
 981 @@ -28,7 +28,7 @@
 982      env.warning 92
 983      env.critical 98
 984
 985 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
 986 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
 987
 988  You may specify filesystem specific warning and critical levels:
 989
 990 @@ -55,7 +55,7 @@
 991
 992  =head1 USAGE
 993
 994 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
 995 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
 996
 997  =head1 MAGIC MARKERS
 998
 999 diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/node.d.linux/df_inode.in
1000 --- munin-2.0.17/plugins/node.d.linux/df_inode.in       2013-07-19 18:30:03.000000000 +0200
1001 +++ munin-2.0.17-sep/plugins/node.d.linux/df_inode.in   2013-08-17 12:25:37.609449943 +0200
1002 @@ -28,7 +28,7 @@
1003      env.warning 92
1004      env.critical 98
1005
1006 -Put it in a file in @@CONFDIR@@/plugin-conf.d/ and restart the munin-node.
1007 +Put it in a file in @@NCONFDIR@@/plugin-conf.d/ and restart the munin-node.
1008
1009  You may specify filesystem specific warning and critical levels:
1010
1011 @@ -55,7 +55,7 @@
1012
1013  =head1 USAGE
1014
1015 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1016 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1017
1018  =head1 MAGIC MARKERS
1019
1020 diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in
1021 --- munin-2.0.17/plugins/node.d.linux/fw_conntrack.in   2013-07-19 18:30:03.000000000 +0200
1022 +++ munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in       2013-08-17 12:19:22.492818051 +0200
1023 @@ -11,7 +11,7 @@
1024
1025  =head2 CONFIGURATION EXAMPLE
1026
1027 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1028 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1029
1030   [fw_*]
1031    user root
1032 diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in
1033 --- munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in     2013-07-19 18:30:03.000000000 +0200
1034 +++ munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in 2013-08-17 12:19:22.492818051 +0200
1035 @@ -10,7 +10,7 @@
1036
1037  =head2 CONFIGURATION EXAMPLE
1038
1039 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1040 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1041
1042   [fw_*]
1043    user root
1044 diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in
1045 --- munin-2.0.17/plugins/node.d.linux/fw_packets.in     2013-07-19 18:30:03.000000000 +0200
1046 +++ munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in 2013-08-17 12:19:22.492818051 +0200
1047 @@ -11,7 +11,7 @@
1048
1049  =head1 CONFIGURATION EXAMPLE
1050
1051 -@@CONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1052 +@@NCONFDIR@@/plugin-conf.d/global or other file in that dir must contain:
1053
1054   [fw*]
1055    user root
1056 diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/node.d.linux/iostat.in
1057 --- munin-2.0.17/plugins/node.d.linux/iostat.in 2013-07-19 18:30:03.000000000 +0200
1058 +++ munin-2.0.17-sep/plugins/node.d.linux/iostat.in     2013-08-17 12:19:22.492818051 +0200
1059 @@ -24,7 +24,7 @@
1060
1061  =head1 USAGE
1062
1063 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1064 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1065
1066  =head1 INTERPRETATION
1067
1068 diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in
1069 --- munin-2.0.17/plugins/node.d.linux/iostat_ios.in     2013-07-19 18:30:03.000000000 +0200
1070 +++ munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in 2013-08-17 12:19:22.492818051 +0200
1071 @@ -15,7 +15,7 @@
1072
1073  =head1 USAGE
1074
1075 -Link this into @@CONFDIR@@/plugins/ and restart the munin-node.
1076 +Link this into @@NCONFDIR@@/plugins/ and restart the munin-node.
1077
1078  =head1 INTERPRETATION
1079
1080 diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/node.d.linux/irqstats.in
1081 --- munin-2.0.17/plugins/node.d.linux/irqstats.in       2013-07-19 18:30:03.000000000 +0200
1082 +++ munin-2.0.17-sep/plugins/node.d.linux/irqstats.in   2013-08-17 12:19:22.492818051 +0200
1083 @@ -15,7 +15,7 @@
1084
1085  =head1 USAGE
1086
1087 -Link this plugin to @@CONFDIR@@/plugins/ and restart the munin-node.
1088 +Link this plugin to @@NCONFDIR@@/plugins/ and restart the munin-node.
1089
1090  =head1 INTERPRETATION
1091
1092 diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resources/hpux-init.d_munin-node.in
1093 --- munin-2.0.17/resources/hpux-init.d_munin-node.in    2013-07-19 18:30:03.000000000 +0200
1094 +++ munin-2.0.17-sep/resources/hpux-init.d_munin-node.in        2013-08-17 12:19:22.492818051 +0200
1095 @@ -6,7 +6,7 @@
1096  PATH=/sbin:/bin:/usr/sbin:/usr/bin
1097  NAME=munin-node
1098  DAEMON=@@SBINDIR@@/$NAME
1099 -CONFFILE=@@CONFDIR@@/munin-node.conf
1100 +CONFFILE=@@NCONFDIR@@/munin-node.conf
1101  RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
1102  PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
1103  MYCONF=/etc/rc.config.d/muninconf
1104 diff -ur munin-2.0.17/resources/linux-cron.d_munin-node.in munin-2.0.17-sep/resources/linux-cron.d_munin-node.in
1105 --- munin-2.0.17/resources/linux-cron.d_munin-node.in   2013-07-19 18:30:03.000000000 +0200
1106 +++ munin-2.0.17-sep/resources/linux-cron.d_munin-node.in       2013-08-17 12:19:22.492818051 +0200
1107 @@ -8,5 +8,5 @@
1108  # an hour (12 invokations an hour, 1 in 12 chance that the update will
1109  # happen), but ensure that there will never be more than two hour (7200
1110  # seconds) interval between updates..
1111 -*/5 * * * *    root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
1112 +*/5 * * * *    root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
1113
1114 diff -ur munin-2.0.17/t/Makefile.config munin-2.0.17-sep/t/Makefile.config
1115 --- munin-2.0.17/t/Makefile.config      2013-07-19 18:30:03.000000000 +0200
1116 +++ munin-2.0.17-sep/t/Makefile.config  2013-08-17 12:19:22.492818051 +0200
1117 @@ -9,7 +9,8 @@
1118  PREFIX     = $(PWD)/t/install
1119
1120  # Where Munin keeps its configurations (server.conf, client.conf, ++)
1121 -CONFDIR    = $(PREFIX)/etc
1122 +MCONFDIR    = $(PREFIX)/etc
1123 +NCONFDIR    = $(PREFIX)/etc
1124
1125  # Client only - Where to put RRD files and other intenal data
1126  DBDIR      = $(PREFIX)/var/lib