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,8 +72,8 @@
+@@ -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,14 +87,14 @@
+@@ -87,15 +87,15 @@
$(CHMOD) 0755 $(DBDIR)
- for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
+ 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 0644 master/www/definitions.html $(CONFDIR)/templates/
-+ $(INSTALL) -m 0644 master/www/definitions.html $(TEMPLATEDIR)/
$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
-
@@ -217,6 +217,7 @@
+ -e 's|@@GOODSH@@|$(GOODSH)|g' \
-e 's|@@BASH@@|$(BASH)|g' \
-e 's|@@HASSETR@@|$(HASSETR)|g' \
- -e 's|@@SSPOOLDIR@@|$(SSPOOLDIR)|g' \
+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
$< > $@;
-@@ -255,6 +256,7 @@
+@@ -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{(SSPOOLDIR \s+=\s).*}{\1q{$(SSPOOLDIR)};}x;' \
-+ s{(SSPOOLDIR \s+=\s).*}{\1q{$(SSPOOLDIR)};}x; \
-+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}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/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,7 +156,7 @@
+@@ -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",
-+ tmpldir => $Munin::Common::Defaults::MUNIN_TEMPLATEDIR,
+- 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 ),
- oldconfig => bless ( {
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,7 +273,7 @@
+@@ -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->{'tmpldir'} ||= $Munin::Common::Defaults::MUNIN_TEMPLATEDIR;
+- $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,7 +11,7 @@
- # rundir @@STATEDIR@@
- #
+@@ -11,11 +11,11 @@
+
# Where to look for the HTML templates
--# tmpldir @@CONFDIR@@/templates
-+# tmpldir @@TEMPLATEDIR@@
+ #
+-#tmpldir @@CONFDIR@@/templates
++#tmpldir @@TEMPLATEDIR@@
- # (Exactly one) directory to include all files from.
+ # 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).
projects / packages / munin.git / blobdiff