diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm --- munin-1.4.0/common/lib/Munin/Common/Defaults.pm 2009-11-27 12:17:16.000000000 +0100 +++ munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm 2009-11-30 15:53:32.281661475 +0100 @@ -30,6 +30,7 @@ our $MUNIN_MANDIR = ''; our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; our $MUNIN_STATEDIR = ''; +our $MUNIN_TEMPLATEDIR = ''; our $MUNIN_USER = getpwuid $UID; our $MUNIN_GROUP = getgrgid $GID; our $MUNIN_PLUGINUSER = getpwuid $UID; 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 --- munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in 2009-11-27 12:17:18.000000000 +0100 +++ munin-1.4.0.template/contrib/munin-every-services-all-boxes-build-html.in 2009-11-30 15:31:14.400724600 +0100 @@ -23,7 +23,7 @@ chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes -in @@CONFDIR@@/templates/munin-overview.tmpl: +in @@TEMPLATEDIR@@/munin-overview.tmpl:
every services on all boxes diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile --- munin-1.4.0/Makefile 2009-11-30 15:56:58.665729798 +0100 +++ munin-1.4.0.template/Makefile 2009-11-30 15:43:56.093673451 +0100 @@ -72,9 +72,9 @@ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) install-master-prime: $(INFILES_MASTER) install-pre install-master - mkdir -p $(CONFDIR)/templates - mkdir -p $(CONFDIR)/static - mkdir -p $(CONFDIR)/templates/partial + mkdir -p $(TEMPLATEDIR) + mkdir -p $(TEMPLATEDIR)/static + mkdir -p $(TEMPLATEDIR)/partial mkdir -p $(CONFDIR)/munin-conf.d mkdir -p $(LIBDIR) mkdir -p $(BINDIR) @@ -87,15 +87,15 @@ $(CHMOD) 0755 $(DBDIR) for p in master/www/*.tmpl ; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/ ; \ done for p in master/static/* ; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ + $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/static/ ; \ done for p in master/www/partial/*.tmpl; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ + $(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/partial/ ; \ done $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/ @@ -217,6 +217,7 @@ -e 's|@@GOODSH@@|$(GOODSH)|g' \ -e 's|@@BASH@@|$(BASH)|g' \ -e 's|@@HASSETR@@|$(HASSETR)|g' \ + -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \ $< > $@; @@ -255,7 +256,8 @@ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \ s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \ - s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \ + s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \ + s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\ $< > $@ build-doc: build-doc-stamp Makefile Makefile.config diff -ur munin-1.4.0/Makefile.config munin-1.4.0.template/Makefile.config --- munin-1.4.0/Makefile.config 2009-11-30 15:56:58.665729798 +0100 +++ munin-1.4.0.template/Makefile.config 2009-11-30 15:44:54.459859861 +0100 @@ -40,6 +40,7 @@ # Server only - Output directory HTMLDIR = $(DESTDIR)/var/lib/munin/html CGIDIR = $(LIBDIR)/cgi +TEMPLATEDIR= $(DESTDIR)/etc/webapps/munin/templates # Server only - spool directory for data gathered from nodes by # munin-gather - experimental. Place on ramdisk to make munin diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/doc/munin.conf.pod.in --- munin-1.4.0/master/doc/munin.conf.pod.in 2009-11-27 12:17:16.000000000 +0100 +++ munin-1.4.0.template/master/doc/munin.conf.pod.in 2009-11-30 15:51:40.016661676 +0100 @@ -68,7 +68,7 @@ Directory for files tracking munin's current running state. Required. -=item B I (Default: F<@@CONFDIR@@/templates>) +=item B I (Default: F<@@TEMPLATEDIR@@>) Directory for templates used to generate HTML pages. Required. diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/master/lib/Munin/Master/Config.pm --- munin-1.4.0/master/lib/Munin/Master/Config.pm 2009-11-27 12:17:17.000000000 +0100 +++ munin-1.4.0.template/master/lib/Munin/Master/Config.pm 2009-11-30 15:50:50.533791958 +0100 @@ -156,8 +156,8 @@ tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", tls_verify_certificate => 0, tls_verify_depth => 5, - tmpldir => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates", - staticdir => "$Munin::Common::Defaults::MUNIN_CONFDIR/static", + tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR", + staticdir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static", cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp", }, $class ), diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/master/lib/Munin/Master/Utils.pm --- munin-1.4.0/master/lib/Munin/Master/Utils.pm 2009-11-27 12:17:18.000000000 +0100 +++ munin-1.4.0.template/master/lib/Munin/Master/Utils.pm 2009-11-30 15:49:47.135724128 +0100 @@ -273,8 +273,8 @@ $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR; $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR; $config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR; - $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/"; - $config->{'staticdir'} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/static/"; + $config->{'tmpldir'} ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR"; + $config->{'staticdir'} ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static/"; $config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR; $config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR; $config->{'#%#parent'} = undef; diff -ur munin-1.4.0/master/munin.conf.in munin-1.4.0.template/master/munin.conf.in --- munin-1.4.0/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100 +++ munin-1.4.0.template/master/munin.conf.in 2009-11-30 15:47:40.690849769 +0100 @@ -11,11 +11,11 @@ # Where to look for the HTML templates # -#tmpldir @@CONFDIR@@/templates +#tmpldir @@TEMPLATEDIR@@ # Where to look for the static www files # -#staticdir @@CONFDIR@@/static +#staticdir @@TEMPLATEDIR@@/static # temporary cgi files are here. note that it has to be writable by # the cgi user (usually nobody or httpd).