[Pkg-nagios-changes] [pkg-nagios] r1938 - nagvis/trunk/debian

[Alexander Reichle-Schmehl]

tags 595313 pending
thanks

Author: tolimar
Date: 2011-09-07 11:55:13 +0000 (Wed, 07 Sep 2011)
New Revision: 1938

Modified:
   nagvis/trunk/debian/README.Debian
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/config
Log:
Import changes from the 1:1.4.6-1.1 NMU



Modified: nagvis/trunk/debian/README.Debian
===================================================================
--- nagvis/trunk/debian/README.Debian	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/trunk/debian/README.Debian	2011-09-07 11:55:13 UTC (rev 1938)
@@ -1,6 +1,14 @@
 nagvis for Debian
 -----------------
 
+Since Version 1:1.4.6-1.1 you may also use nagvis with a remote database.
+However you'll need to configure the Database settings by hand.
+
+Please see /usr/share/nagvis/debian/nagvis.ini.php-sample for an example
+configuration file, and place it at /etc/nagvis/nagvis.ini.php.
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Wed, 13 Oct 2010 15:44:01 +0200
+
 Starting with 1.4.5, there are changes from older packages.
 
 * URL and CGI-Path:

Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/trunk/debian/changelog	2011-09-07 11:55:13 UTC (rev 1938)
@@ -1,3 +1,11 @@
+nagvis (1:1.4.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Only try to configure local database, if ndoutils is run localy
+    (Closes: #595313)
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Mon, 11 Oct 2010 13:55:28 +0200
+
 nagvis (1:1.4.6-1) unstable; urgency=low
 
   [ Hendrik Frenzel ]

Modified: nagvis/trunk/debian/config
===================================================================
--- nagvis/trunk/debian/config	2011-09-07 10:28:20 UTC (rev 1937)
+++ nagvis/trunk/debian/config	2011-09-07 11:55:13 UTC (rev 1938)
@@ -4,15 +4,18 @@
 . /usr/share/debconf/confmodule
 
 tmp=`mktemp`
-dbconfig-load-include -f sh \
-	-udbc_dbuser -pdbc_dbpass -ddbc_dbname -sdbc_dbserver -Pdbc_dbport \
-	/etc/dbconfig-common/ndoutils-mysql.conf > $tmp
-. $tmp
-rm -f $tmp
 
-if [ -f /usr/share/dbconfig-common/dpkg/frontend.config.mysql ]; then
-	. /usr/share/dbconfig-common/dpkg/frontend.config.mysql
-	dbc_go nagvis $@
+if [ -f /etc/dbconfig-common/ndoutils-mysql.conf ] ; then
+	dbconfig-load-include -f sh \
+		-udbc_dbuser -pdbc_dbpass -ddbc_dbname -sdbc_dbserver -Pdbc_dbport \
+		/etc/dbconfig-common/ndoutils-mysql.conf > $tmp
+	. $tmp
+	if [ -f /usr/share/dbconfig-common/dpkg/frontend.config.mysql ]; then
+		. /usr/share/dbconfig-common/dpkg/frontend.config.mysql
+		dbc_go nagvis $@
+	fi
+	db_stop
 fi
-db_stop
 
+rm -f $tmp
+