munin-templatedir.patch

   1 diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm
   2 --- munin-1.4.0/common/lib/Munin/Common/Defaults.pm     2009-11-27 12:17:16.000000000 +0100
   3 +++ munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm    2009-11-30 15:53:32.281661475 +0100
   4 @@ -30,6 +30,7 @@
   5  our $MUNIN_MANDIR     = '';
   6  our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
   7  our $MUNIN_STATEDIR   = '';
   8 +our $MUNIN_TEMPLATEDIR = '';
   9  our $MUNIN_USER       = getpwuid $UID;
  10  our $MUNIN_GROUP      = getgrgid $GID;
  11  our $MUNIN_PLUGINUSER = getpwuid $UID;
  12 diff -ur munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in munin-1.4.0.template/contrib/munin-every-services-all-boxes-build-html.in
  13 --- munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in    2009-11-27 12:17:18.000000000 +0100
  14 +++ munin-1.4.0.template/contrib/munin-every-services-all-boxes-build-html.in   2009-11-30 15:31:14.400724600 +0100
  15 @@ -23,7 +23,7 @@
  16
  17    chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
  18
  19 -in @@CONFDIR@@/templates/munin-overview.tmpl:
  20 +in @@TEMPLATEDIR@@/munin-overview.tmpl:
  21
  22   <div class="box">
  23      <a href=every-services-all-boxes>every services on all boxes</a>
  24 diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
  25 --- munin-1.4.0/Makefile        2009-11-30 15:56:58.665729798 +0100
  26 +++ munin-1.4.0.template/Makefile       2009-11-30 15:43:56.093673451 +0100
  27 @@ -72,8 +72,8 @@
  28         $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
  29
  30  install-master-prime: $(INFILES_MASTER) install-pre install-master
  31 -       mkdir -p $(CONFDIR)/templates
  32 -       mkdir -p $(CONFDIR)/templates/partial
  33 +       mkdir -p $(TEMPLATEDIR)
  34 +       mkdir -p $(TEMPLATEDIR)/partial
  35         mkdir -p $(CONFDIR)/munin-conf.d
  36         mkdir -p $(LIBDIR)
  37         mkdir -p $(BINDIR)
  38 @@ -87,14 +87,14 @@
  39         $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
  40
  41         for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
  42 -               $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
  43 +               $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/ ; \
  44         done
  45
  46         for p in master/www/partial/*.tmpl; do \
  47 -               $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
  48 +               $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/partial/ ; \
  49         done
  50
  51 -       $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
  52 +       $(INSTALL) -m 0644 master/www/definitions.html $(TEMPLATEDIR)/
  53         $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
  54
  55         test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
  56 @@ -217,6 +217,7 @@
  57               -e 's|@@BASH@@|$(BASH)|g'                          \
  58               -e 's|@@HASSETR@@|$(HASSETR)|g'                    \
  59               -e 's|@@SSPOOLDIR@@|$(SSPOOLDIR)|g'                \
  60 +             -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g'            \
  61               $< > $@;
  62
  63
  64 @@ -255,6 +256,7 @@
  65                    s{(GOODSH    \s+=\s).*}{\1q{$(GOODSH)};}x;      \
  66                    s{(BASH      \s+=\s).*}{\1q{$(BASH)};}x;        \
  67                    s{(HASSETR   \s+=\s).*}{\1q{$(HASSETR)};}x;     \
  68 -                 s{(SSPOOLDIR  \s+=\s).*}{\1q{$(SSPOOLDIR)};}x;'  \
  69 +                 s{(SSPOOLDIR  \s+=\s).*}{\1q{$(SSPOOLDIR)};}x;   \
  70 +                 s{(TEMPLATEDIR        \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'  \
  71                    $< > $@
  72
  73  build-doc: build-doc-stamp Makefile Makefile.config
  74 diff -ur munin-1.4.0/Makefile.config munin-1.4.0.template/Makefile.config
  75 --- munin-1.4.0/Makefile.config 2009-11-30 15:56:58.665729798 +0100
  76 +++ munin-1.4.0.template/Makefile.config        2009-11-30 15:44:54.459859861 +0100
  77 @@ -40,6 +40,7 @@
  78  # Server only - Output directory
  79  HTMLDIR    = $(DESTDIR)/var/lib/munin/html
  80  CGIDIR     = $(LIBDIR)/cgi
  81 +TEMPLATEDIR= $(DESTDIR)/etc/webapps/munin/templates
  82
  83  # Server only - spool directory for data gathered from nodes by
  84  # munin-gather - experimental.  Place on ramdisk to make munin
  85 diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/doc/munin.conf.pod.in
  86 --- munin-1.4.0/master/doc/munin.conf.pod.in    2009-11-27 12:17:16.000000000 +0100
  87 +++ munin-1.4.0.template/master/doc/munin.conf.pod.in   2009-11-30 15:51:40.016661676 +0100
  88 @@ -68,7 +68,7 @@
  89
  90  Directory for files tracking munin's current running state.  Required.
  91
  92 -=item B<tmpldir> I<path> (Default: F<@@CONFDIR@@/templates>)
  93 +=item B<tmpldir> I<path> (Default: F<@@TEMPLATEDIR@@>)
  94
  95  Directory for templates used to generate HTML pages.  Required.
  96
  97 diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/master/lib/Munin/Master/Config.pm
  98 --- munin-1.4.0/master/lib/Munin/Master/Config.pm       2009-11-27 12:17:17.000000000 +0100
  99 +++ munin-1.4.0.template/master/lib/Munin/Master/Config.pm      2009-11-30 15:50:50.533791958 +0100
 100 @@ -156,7 +156,7 @@
 101                 tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
 102                 tls_verify_certificate => 0,
 103                 tls_verify_depth => 5,
 104 -               tmpldir          => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates",
 105 +               tmpldir          => $Munin::Common::Defaults::MUNIN_TEMPLATEDIR,
 106             }, $class ),
 107
 108             oldconfig => bless ( {
 109 diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/master/lib/Munin/Master/Utils.pm
 110 --- munin-1.4.0/master/lib/Munin/Master/Utils.pm        2009-11-27 12:17:18.000000000 +0100
 111 +++ munin-1.4.0.template/master/lib/Munin/Master/Utils.pm       2009-11-30 15:49:47.135724128 +0100
 112 @@ -273,7 +273,7 @@
 113      $config->{'rundir'}        ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
 114      $config->{'dbdir'}         ||= $Munin::Common::Defaults::MUNIN_DBDIR;
 115      $config->{'logdir'}        ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
 116 -    $config->{'tmpldir'}       ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/";
 117 +    $config->{'tmpldir'}       ||= $Munin::Common::Defaults::MUNIN_TEMPLATEDIR;
 118      $config->{'htmldir'}       ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
 119      $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR;
 120      $config->{'#%#parent'}     = undef;
 121 diff -ur munin-1.4.0/master/munin.conf.in munin-1.4.0.template/master/munin.conf.in
 122 --- munin-1.4.0/master/munin.conf.in    2009-11-27 12:17:18.000000000 +0100
 123 +++ munin-1.4.0.template/master/munin.conf.in   2009-11-30 15:47:40.690849769 +0100
 124 @@ -11,7 +11,7 @@
 125  # rundir  @@STATEDIR@@
 126  #
 127  # Where to look for the HTML templates
 128 -# tmpldir      @@CONFDIR@@/templates
 129 +# tmpldir      @@TEMPLATEDIR@@
 130
 131  # (Exactly one) directory to include all files from.
 132  #