[Pkg-nagios-changes] [pkg-nagios] r1798 - in nagvis/trunk/debian: . patches

Wolfgang Barth wob-guest at alioth.debian.org
Sun Nov 29 18:29:25 UTC 2009 

Author: wob-guest
Date: 2009-11-29 18:29:25 +0000 (Sun, 29 Nov 2009)
New Revision: 1798

Added:
   nagvis/trunk/debian/patches/30_GlobalMainCfg_bugfix.dpatch
Modified:
   nagvis/trunk/debian/apache.conf
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/dirs
   nagvis/trunk/debian/docs
   nagvis/trunk/debian/examples
   nagvis/trunk/debian/patches/00list
   nagvis/trunk/debian/patches/10_pathnames.dpatch
   nagvis/trunk/debian/rules
Log:
all images now in /var/lib/nagvis/images
workaround for bug in nagvis-1.4.5: apache alias /nagvis/nagvis/images
  (should be removed as soon as possible)
todo: more cleanup in /usr/share/nagvis/htdocs/nagvis neccessary


Modified: nagvis/trunk/debian/apache.conf
===================================================================
--- nagvis/trunk/debian/apache.conf	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/apache.conf	2009-11-29 18:29:25 UTC (rev 1798)
@@ -1,4 +1,7 @@
 # -- new style
+Alias /nagvis/nagvis/templates /etc/nagvis/templates
+Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
+Alias /nagvis/nagvis/images /var/lib/nagvis/images
 Alias /nagvis /usr/share/nagvis/htdocs
 
 # -- old style

Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/changelog	2009-11-29 18:29:25 UTC (rev 1798)
@@ -3,14 +3,13 @@
   * (NOT RELEASED YET) New upstream release
   [ Wolfgang Barth ]
   * New upstream version
-  * switching location of templates from /etc/nagvis/templates back to
-    /usr/share/nagvis/htdocs/nagvis/templates
   * User uploaded maps now in /var/lib/nagvis/images/maps 
     (1.3.1: /etc/maps) to avoid security problems
   * Cache location nagvis/var ist now /var/cache/nagvis
   * nagios independent htmlbase /nagvis and corresponding apache.conf
     linked to /etc/apache2/conf.d
   * README.backends.Merlin added
+  * all images now in /var/lib/nagvis/images
 
   [ Alexander Wirt ]
   * New upstream version 

Modified: nagvis/trunk/debian/dirs
===================================================================
--- nagvis/trunk/debian/dirs	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/dirs	2009-11-29 18:29:25 UTC (rev 1798)
@@ -1,5 +1,4 @@
 etc/nagvis/maps
-etc/nagvis/templates
 var/lib/nagvis/images
 var/lib/nagvis/images/maps
 var/cache/nagvis

Modified: nagvis/trunk/debian/docs
===================================================================
--- nagvis/trunk/debian/docs	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/docs	2009-11-29 18:29:25 UTC (rev 1798)
@@ -1,2 +1,2 @@
 README
-docs/Changelog
+docs/changelog

Modified: nagvis/trunk/debian/examples
===================================================================
--- nagvis/trunk/debian/examples	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/examples	2009-11-29 18:29:25 UTC (rev 1798)
@@ -1,2 +1,2 @@
-debian/nagvis/demo
+debian/tmp/demo
 etc/nagvis.ini.php-sample

Modified: nagvis/trunk/debian/patches/00list
===================================================================
--- nagvis/trunk/debian/patches/00list	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/patches/00list	2009-11-29 18:29:25 UTC (rev 1798)
@@ -1,2 +1,3 @@
 10_pathnames.dpatch
 20_configpath.dpatch
+30_GlobalMainCfg_bugfix.dpatch

Modified: nagvis/trunk/debian/patches/10_pathnames.dpatch
===================================================================
--- nagvis/trunk/debian/patches/10_pathnames.dpatch	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/patches/10_pathnames.dpatch	2009-11-29 18:29:25 UTC (rev 1798)
@@ -7,8 +7,8 @@
 @DPATCH@
 diff -urNad trunk~/etc/nagvis.ini.php-sample trunk/etc/nagvis.ini.php-sample
 --- trunk~/etc/nagvis.ini.php-sample	2009-11-27 16:41:36.000000000 +0100
-+++ trunk/etc/nagvis.ini.php-sample	2009-11-28 17:20:58.000000000 +0100
-@@ -24,17 +24,20 @@
++++ trunk/etc/nagvis.ini.php-sample	2009-11-29 19:09:27.000000000 +0100
+@@ -24,17 +24,26 @@
  
  ; Path definitions
  [paths]
@@ -17,8 +17,14 @@
 +base="/usr/share/nagvis/htdocs/"
 +cfg="/etc/nagvis/"
 +var="/var/cache/nagvis/"
++mapcfg="/etc/nagvis/maps/"
++images="/var/lib/nagvis/images/"
++icon="/var/lib/nagvis/images/iconsets/"
++shape="/var/lib/nagvis/images/shapes/"
 +map="/var/lib/nagvis/images/maps/"
-+mapcfg="/etc/nagvis/maps/"
++headertemplate="/etc/nagvis/templates/header/"
++hovertemplate="/etc/nagvis/templates/hover/"
++contexttemplate="/etc/nagvis/templates/context/"
  ; absolute html NagVis path
 -;htmlbase="/nagios/nagvis"
 +htmlbase="/nagvis"
@@ -34,7 +40,7 @@
  ; background color of maps
  ;backgroundcolor="#fff"
  ; Enable/Disable the context menu on map objects. With the context menu you are
-@@ -123,7 +126,7 @@
+@@ -123,7 +132,7 @@
  ; Default root host (NagVis uses this if it can't detect it via NDO)
  ;defaultroot=""
  ; Path to the graphviz binaries (dot,neato,...); Only needed if not in ENV PATH
@@ -43,7 +49,7 @@
  ; Show the automap in the lists (Map index and dropdown menu in header)
  ;showinlists=1
  
-@@ -158,8 +161,8 @@
+@@ -158,8 +167,8 @@
  ; ----------------------------
  
  ; Example definition of a livestatus backend. In this case the backend_id is live_1
@@ -54,7 +60,7 @@
  ;socket="unix:/usr/local/nagios/var/rw/live"
  
  ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
-@@ -186,9 +189,9 @@
+@@ -186,9 +195,9 @@
  ;htmlcgi="/nagios/cgi-bin"
  
  ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID.
@@ -66,7 +72,7 @@
  ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are
  ;path="/usr/local/ndo2fs/var"
  ; Name of the instance to get the data from
-@@ -198,37 +201,18 @@
+@@ -198,37 +207,18 @@
  ; path to the cgi-bin of this backend
  ;htmlcgi="/nagios/cgi-bin"
  

Added: nagvis/trunk/debian/patches/30_GlobalMainCfg_bugfix.dpatch
===================================================================
--- nagvis/trunk/debian/patches/30_GlobalMainCfg_bugfix.dpatch	                        (rev 0)
+++ nagvis/trunk/debian/patches/30_GlobalMainCfg_bugfix.dpatch	2009-11-29 18:29:25 UTC (rev 1798)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_GlobalMainCfg_bugfix.dpatch by Wolfgang Barth <wob at swobspace.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/nagvis/includes/classes/GlobalMainCfg.php trunk/nagvis/includes/classes/GlobalMainCfg.php
+--- trunk~/nagvis/includes/classes/GlobalMainCfg.php	2009-11-27 16:41:36.000000000 +0100
++++ trunk/nagvis/includes/classes/GlobalMainCfg.php	2009-11-29 18:54:35.000000000 +0100
+@@ -348,7 +348,7 @@
+ 					'editable' => 0,
+ 					'default' => '',
+ 					'match' => MATCH_STRING_PATH),
+-				'hovercontext' => Array('must' => 0,
++				'contexttemplate' => Array('must' => 0,
+ 					'editable' => 0,
+ 					'default' => '',
+ 					'match' => MATCH_STRING_PATH),


Property changes on: nagvis/trunk/debian/patches/30_GlobalMainCfg_bugfix.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2009-11-29 13:13:18 UTC (rev 1797)
+++ nagvis/trunk/debian/rules	2009-11-29 18:29:25 UTC (rev 1798)
@@ -6,6 +6,7 @@
 
 include /usr/share/dpatch/dpatch.make
 DEST = debian/nagvis
+TMP  = debian/tmp
 
 configure: configure-stamp
 configure-stamp:
@@ -33,9 +34,18 @@
 	dh_clean -k
 	dh_installdirs
 	dh_install
+
+	# -- images to /var 
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/* $(DEST)/var/lib/nagvis/images/.
+
+        # -- templates
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/templates $(DEST)/etc/nagvis/.
+
+	# -- gadgets
+	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/gadgets $(DEST)/etc/nagvis/.
 	
 	[ -x /usr/bin/html2text ] && \
-		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/Changelog
+		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog
 	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
 		$(DEST)/usr/share/nagvis/debian/
 	sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
@@ -49,11 +59,8 @@
 	    $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
 	
 	# demo site
-	install -d $(DEST)/demo/nagvis/images/maps $(DEST)/demo/etc/nagvis/maps
-	mv $(DEST)/etc/nagvis/maps/demo*.cfg $(DEST)/demo/etc/nagvis/maps/
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps/nagvis-demo.png \
-		$(DEST)/demo/nagvis/images/maps/
-	rm -rf $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps
+	install -d $(TMP)/demo/etc/nagvis/maps
+	mv $(DEST)/etc/nagvis/maps/demo*.cfg $(TMP)/demo/etc/nagvis/maps/
 	
 	dh_link
 	dh_lintian

More information about the Pkg-nagios-changes mailing list