|
 |
7060db0 |
diff -ru munin-2.0.8.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.8/common/lib/Munin/Common/Defaults.pm
|
|
|
7060db0 |
--- munin-2.0.8.orig/common/lib/Munin/Common/Defaults.pm 2012-11-09 06:10:22.000000000 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/common/lib/Munin/Common/Defaults.pm 2012-11-13 09:04:32.575210838 -0600
|
|
|
7060db0 |
@@ -25,7 +25,7 @@
|
|
|
7060db0 |
our $MUNIN_LIBDIR = '';
|
|
|
7060db0 |
our $MUNIN_HTMLDIR = '';
|
|
|
7060db0 |
our $MUNIN_CGIDIR = '';
|
|
|
7060db0 |
-our $MUNIN_CGITMPDIR = '';
|
|
|
7060db0 |
+our $MUNIN_CGITMPDIR = '';
|
|
|
7060db0 |
our $MUNIN_DBDIR = '';
|
|
|
7060db0 |
our $MUNIN_PLUGSTATE = '';
|
|
|
7060db0 |
our $MUNIN_SPOOLDIR = '';
|
|
|
7060db0 |
diff -ru munin-2.0.8.orig/Makefile munin-2.0.8/Makefile
|
|
|
7060db0 |
--- munin-2.0.8.orig/Makefile 2012-11-09 06:10:22.000000000 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/Makefile 2012-11-13 09:04:32.573210662 -0600
|
|
|
7060db0 |
@@ -85,14 +85,14 @@
|
|
|
7060db0 |
mkdir -p $(PERLLIB)/Munin/Master
|
|
|
7060db0 |
mkdir -p $(HTMLDIR)
|
|
|
7060db0 |
mkdir -p $(DBDIR)
|
|
|
7060db0 |
- mkdir -p $(DBDIR)/cgi-tmp
|
|
|
7060db0 |
+ mkdir -p $(CGITMPDIR)
|
|
|
7060db0 |
mkdir -p $(CGIDIR)
|
|
|
7060db0 |
|
|
|
7060db0 |
$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
|
|
|
7060db0 |
$(CHMOD) 0755 $(DBDIR)
|
|
|
7060db0 |
|
|
|
7060db0 |
- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
|
|
|
7060db0 |
- $(CHMOD) 0755 $(DBDIR)/cgi-tmp
|
|
|
7060db0 |
+ $(CHOWN) $(CGIUSER) $(CGITMPDIR)
|
|
|
7060db0 |
+ $(CHMOD) 0755 $(CGITMPDIR)
|
|
|
7060db0 |
|
|
|
7060db0 |
for p in master/www/*.tmpl ; do \
|
|
|
7060db0 |
$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
|
|
|
7060db0 |
@@ -278,6 +278,7 @@
|
|
|
7060db0 |
s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \
|
|
|
7060db0 |
s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \
|
|
|
7060db0 |
s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \
|
|
|
7060db0 |
+ s{(CGITMPDIR \s+=\s).*}{\1q{$(CGITMPDIR)};}x; \
|
|
|
7060db0 |
s{(USER \s+=\s).*}{\1q{$(USER)};}x; \
|
|
|
7060db0 |
s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \
|
|
|
7060db0 |
s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
|
|
|
7060db0 |
diff -ru munin-2.0.8.orig/Makefile.config munin-2.0.8/Makefile.config
|
|
|
7060db0 |
--- munin-2.0.8.orig/Makefile.config 2012-11-13 09:03:48.687224173 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/Makefile.config 2012-11-13 09:04:32.574210750 -0600
|
|
|
7060db0 |
@@ -44,6 +44,9 @@
|
|
|
7060db0 |
# Where to put internal data for master (RRD, internal files, ...)
|
|
|
816a065 |
DBDIR = $(DESTDIR)/var/opt/munin
|
|
|
7060db0 |
|
|
|
7060db0 |
+# Where to put CGI cached files (for master only)
|
|
|
7060db0 |
+CGITMPDIR = $(DBDIR)/cgi-tmp
|
|
|
7060db0 |
+
|
|
|
7060db0 |
# Where to put internal data for node (plugin state, ...)
|
|
|
7060db0 |
DBDIRNODE = $(DESTDIR)/var/opt/munin-node
|
|
|
7060db0 |
|
|
|
7060db0 |
diff -ru munin-2.0.8.orig/master/_bin/munin-cgi-graph.in munin-2.0.8/master/_bin/munin-cgi-graph.in
|
|
|
7060db0 |
--- munin-2.0.8.orig/master/_bin/munin-cgi-graph.in 2012-11-09 06:10:22.000000000 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/master/_bin/munin-cgi-graph.in 2012-11-13 09:04:32.576210926 -0600
|
|
|
7060db0 |
@@ -332,7 +332,7 @@
|
|
|
7060db0 |
my $params = shift;
|
|
|
7060db0 |
|
|
|
7060db0 |
# XXX - hack to fix cgitmpdir default
|
|
|
7060db0 |
- $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp";
|
|
|
7060db0 |
+ $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_CGITMPDIR";
|
|
|
7060db0 |
my $cgi_tmp_dir = $config->{cgitmpdir} . "/munin-cgi-graph";
|
|
|
7060db0 |
|
|
|
7060db0 |
$params = $params ? "?$params" : "";
|
|
|
7060db0 |
diff -ru munin-2.0.8.orig/master/lib/Munin/Master/Config.pm munin-2.0.8/master/lib/Munin/Master/Config.pm
|
|
|
7060db0 |
--- munin-2.0.8.orig/master/lib/Munin/Master/Config.pm 2012-11-09 06:10:22.000000000 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/master/lib/Munin/Master/Config.pm 2012-11-13 09:04:32.576210926 -0600
|
|
|
7060db0 |
@@ -159,7 +159,7 @@
|
|
|
7060db0 |
tls_verify_depth => 5,
|
|
|
7060db0 |
tmpldir => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates",
|
|
|
7060db0 |
staticdir => "$Munin::Common::Defaults::MUNIN_CONFDIR/static",
|
|
|
7060db0 |
- cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
|
|
|
7060db0 |
+ cgitmpdir => "$Munin::Common::Defaults::MUNIN_CGITMPDIR",
|
|
|
7060db0 |
}, $class ),
|
|
|
7060db0 |
|
|
|
7060db0 |
oldconfig => bless ( {
|
|
|
7060db0 |
Only in munin-2.0.8.orig/master/lib/Munin/Master: Utils.pm.orig
|
|
|
7060db0 |
diff -ru munin-2.0.8.orig/master/munin.conf.in munin-2.0.8/master/munin.conf.in
|
|
|
7060db0 |
--- munin-2.0.8.orig/master/munin.conf.in 2012-11-09 06:10:22.000000000 -0600
|
|
|
7060db0 |
+++ munin-2.0.8/master/munin.conf.in 2012-11-13 09:04:32.576210926 -0600
|
|
|
7060db0 |
@@ -21,7 +21,7 @@
|
|
|
7060db0 |
# temporary cgi files are here. note that it has to be writable by
|
|
|
7060db0 |
# the cgi user (usually nobody or httpd).
|
|
|
7060db0 |
#
|
|
|
7060db0 |
-# cgitmpdir @@DBDIR@@/cgi-tmp
|
|
|
7060db0 |
+# cgitmpdir @@CGITMPDIR@@
|
|
|
7060db0 |
|
|
|
7060db0 |
# (Exactly one) directory to include all files from.
|
|
|
7060db0 |
includedir @@CONFDIR@@/munin-conf.d
|