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

[Alexander Reichle-Schmehl]

tags 611909 pending
thanks

Author: tolimar
Date: 2011-09-07 12:23:13 +0000 (Wed, 07 Sep 2011)
New Revision: 1944

Modified:
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/patches/config.dpatch
   nagvis/trunk/debian/rules
Log:
Set gadget path in configuration file



Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2011-09-07 12:03:22 UTC (rev 1943)
+++ nagvis/trunk/debian/changelog	2011-09-07 12:23:13 UTC (rev 1944)
@@ -4,9 +4,12 @@
   * Add myself to uploaders
   * Only call ucf on purge if it's available (Closes: #620037)
     * Set urgency to medium due to RC bug fix
+  * Set Path to gadget files in example configuration (via
+    patches/config.dpatch) and activate default configuration
+    (Closes: #611909)
+ 
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Wed, 07 Sep 2011 14:21:29 +0200
 
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Wed, 07 Sep 2011 14:02:20 +0200
-
 nagvis (1:1.4.6-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: nagvis/trunk/debian/patches/config.dpatch
===================================================================
--- nagvis/trunk/debian/patches/config.dpatch	2011-09-07 12:03:22 UTC (rev 1943)
+++ nagvis/trunk/debian/patches/config.dpatch	2011-09-07 12:23:13 UTC (rev 1944)
@@ -5,10 +5,10 @@
 ## DP: changes default configs
 
 @DPATCH@
-diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
 --- nagvis-1.4.6~/etc/nagvis.ini.php-sample	2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/etc/nagvis.ini.php-sample	2010-03-01 18:40:01.000000000 +0100
-@@ -24,17 +24,26 @@
++++ nagvis-1.4.6/etc/nagvis.ini.php-sample	2011-09-07 14:19:01.000000000 +0200
+@@ -24,17 +24,27 @@
  
  ; Path definitions
  [paths]
@@ -25,6 +25,7 @@
 +headertemplate="/etc/nagvis/templates/header/"
 +hovertemplate="/etc/nagvis/templates/hover/"
 +contexttemplate="/etc/nagvis/templates/context/"
++gadget="/etc/nagvis/gadgets"
  ; absolute html NagVis path
 -;htmlbase="/nagios/nagvis"
 +htmlbase="/nagvis"
@@ -79,9 +80,9 @@
  
  ; ------------------------------------------------------------------------------
  ; Below you find some advanced stuff
-diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
 --- nagvis-1.4.6~/nagvis/includes/defines/global.php	2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/defines/global.php	2010-03-01 18:39:30.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/defines/global.php	2011-09-07 14:18:33.000000000 +0200
 @@ -61,13 +61,13 @@
  define('DEBUGLEVEL', 4);
  

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2011-09-07 12:03:22 UTC (rev 1943)
+++ nagvis/trunk/debian/rules	2011-09-07 12:23:13 UTC (rev 1944)
@@ -51,6 +51,8 @@
 	[ -x /usr/bin/html2text ] && \
 		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog
 	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
+		$(DEST)/etc/nagvis/nagvis.ini.php
+	cp $(DEST)/etc/nagvis/nagvis.ini.php-sample \
 		$(DEST)/usr/share/nagvis/debian/
 	sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
 	    -e 's/^[; ]*\(\<dbport\) *=.*$$/\1=_DBC_DBPORT_/' \