Import changes from the 1:1.4.6-1.1 NMU

git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1938 98d490a6-b407-0410-aaaa-fdee166ba3f5

diff --git a/debian/README.Debian b/debian/README.Debian
index 198131d8e65531f4f127284d882c31d1d067a810..7baeb53d9daa935fa7a8538eaeaf784e88ff399a 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,14 @@
 nagvis for Debian
 -----------------
 
 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@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:
 Starting with 1.4.5, there are changes from older packages.
 
 * URL and CGI-Path:

diff --git a/debian/changelog b/debian/changelog
index 9f2a85580f373ef01d4478d0e93687ad6bd011f7..16c3c6dd6faa2231de9e0d09d870664b0d1a504a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org>  Mon, 11 Oct 2010 13:55:28 +0200
+

 nagvis (1:1.4.6-1) unstable; urgency=low
 
   [ Hendrik Frenzel ]
 nagvis (1:1.4.6-1) unstable; urgency=low
 
   [ Hendrik Frenzel ]

diff --git a/debian/config b/debian/config
index 7e02dfc63e4bb7fac09cb42f8d001d0edcad1316..d405a8b338ea29a2940368c0a5f5ce40ec136615 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -4,15 +4,18 @@ set -e
 . /usr/share/debconf/confmodule
 
 tmp=`mktemp`
 . /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
 fi

-db_stop
+
+rm -f $tmp