From 4a5a9ff2e77ad3e628b5bf91cc0cfd6978f68516 Mon Sep 17 00:00:00 2001 From: tolimar Date: Wed, 7 Sep 2011 11:55:13 +0000 Subject: [PATCH] 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 --- debian/README.Debian | 8 ++++++++ debian/changelog | 8 ++++++++ debian/config | 21 ++++++++++++--------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 198131d..7baeb53 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -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 Wed, 13 Oct 2010 15:44:01 +0200 + Starting with 1.4.5, there are changes from older packages. * URL and CGI-Path: diff --git a/debian/changelog b/debian/changelog index 9f2a855..16c3c6d 100644 --- 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 Mon, 11 Oct 2010 13:55:28 +0200 + nagvis (1:1.4.6-1) unstable; urgency=low [ Hendrik Frenzel ] diff --git a/debian/config b/debian/config index 7e02dfc..d405a8b 100644 --- a/debian/config +++ b/debian/config @@ -4,15 +4,18 @@ set -e . /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 -- 2.30.2