X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmunin.git;a=blobdiff_plain;f=munin-templatedir.patch;h=fbab79ed6d9613e8a83b4d13b5f343482bd4d92f;hp=eb940203dbfa33de74f2bd528d4278de426326d4;hb=311ac2dde740f49b86d1b3232194529739695dad;hpb=77c4bfbe37910bcd417dafcc6a671698f6cee6b3

diff --git a/munin-templatedir.patch b/munin-templatedir.patch
index eb94020..fbab79e 100644
--- a/munin-templatedir.patch
+++ b/munin-templatedir.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm	2018-10-12 11:46:23.059033000 +0000
+@@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR   = '';
  our $MUNIN_MANDIR     = '';
  our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
  our $MUNIN_STATEDIR   = ''; 
@@ -9,10 +9,10 @@ diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.template/co
  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 @@
+diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in	2018-10-12 11:46:23.059033000 +0000
+@@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig
  
    chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
  
@@ -21,11 +21,11 @@ diff -ur munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in munin-
  
   <div class="box">
      <a href=every-services-all-boxes>every services on all boxes</a>
-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)
+diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
+--- munin-2.0.42.orig/Makefile	2018-10-12 11:45:59.366033000 +0000
++++ munin-2.0.42/Makefile	2018-10-12 11:46:35.187033000 +0000
+@@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config
+ 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
 -	mkdir -p $(CONFDIR)/templates
@@ -37,8 +37,8 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
  	mkdir -p $(CONFDIR)/munin-conf.d
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
-@@ -87,15 +87,15 @@
- 	$(CHMOD) 0755 $(DBDIR)
+@@ -121,15 +121,15 @@ install-master-prime: $(INFILES_MASTER)
+ 	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
  
  	for p in master/www/*.tmpl ;  do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
@@ -55,40 +55,48 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
 +		$(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 @@
+ 	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
+@@ -270,6 +270,7 @@ build/%: %.in
+ 		-e 's|@@GOODSH@@|$(GOODSH)|g' \
+ 		-e 's|@@BASH@@|$(BASH)|g' \
+ 		-e 's|@@HASSETR@@|$(HASSETR)|g' \
++		-e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
+ 		$< > $@;
+ 
+ 
+@@ -312,6 +313,7 @@ substitute-confvar-inline:
+ 		-e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \
+ 		-e 's|\@\@BASH\@\@|$(BASH)|g;' \
+ 		-e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \
++		-e 's|\@\@TEMPLATEDIR\@\@|$(TEMPLATEDIR)|g;' \
+ 		$(CONFVAR_SUBSTITUTION_FILES)
+ 
+ 
+@@ -365,7 +367,8 @@ substitute-build-defaults-inline:
+ 		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;' \
+ 		common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
+ 
+ 
+diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
+--- munin-2.0.42.orig/Makefile.config	2018-10-12 11:45:59.366033000 +0000
++++ munin-2.0.42/Makefile.config	2018-10-12 11:46:23.060033000 +0000
+@@ -40,6 +40,7 @@ LIBDIR     = $(PREFIX)/share/munin
  # 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 @@
+ # Where to put internal data for master (RRD, internal files, ...)
+ DBDIR      = $(DESTDIR)/var/lib/munin/db
+diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in
+--- munin-2.0.42.orig/master/doc/munin.conf.pod.in	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/master/doc/munin.conf.pod.in	2018-10-12 11:46:23.060033000 +0000
+@@ -70,7 +70,7 @@ Directory for HTML pages and graphs.  Re
  
  Directory for files tracking munin's current running state.  Required.
  
@@ -97,10 +105,10 @@ diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/do
  
  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 @@
+diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Config.pm	2018-10-12 11:46:23.060033000 +0000
+@@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw(
  		tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
  		tls_verify_certificate => 0,
  		tls_verify_depth => 5,
@@ -109,12 +117,12 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/mast
 +		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 @@
+ 		ssh_command      => "ssh",
+ 		ssh_options      => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
+diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm	2018-10-12 11:46:23.060033000 +0000
+@@ -1001,8 +1001,8 @@ sub munin_readconfig_base {
      $config->{'rundir'}        ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
      $config->{'dbdir'}         ||= $Munin::Common::Defaults::MUNIN_DBDIR;
      $config->{'logdir'}        ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
@@ -123,12 +131,12 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/maste
 +    $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->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
      $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 @@
+diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in
+--- munin-2.0.42.orig/master/munin.conf.in	2018-09-21 02:11:11.000000000 +0000
++++ munin-2.0.42/master/munin.conf.in	2018-10-12 11:46:23.060033000 +0000
+@@ -12,11 +12,11 @@
  
  # Where to look for the HTML templates
  #