From: wob-guest Date: Sat, 28 Nov 2009 16:36:46 +0000 (+0000) Subject: bugfix postrm; backend=merlin from nagvis.ini.php removed (see README.backend.merlin... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=60d520d9a9e7f2db4598dbe448d4c98aad351b75;p=pkg-nagvis.git bugfix postrm; backend=merlin from nagvis.ini.php removed (see README.backend.merlin for configuration) git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1796 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- diff --git a/debian/apache.conf b/debian/apache.conf index 16e5bcb..1683c74 100644 --- a/debian/apache.conf +++ b/debian/apache.conf @@ -1,8 +1,8 @@ # -- new style Alias /nagvis /usr/share/nagvis/htdocs -# -- backward compatibility -Alias /nagios3/nagvis /usr/share/nagvis/htdocs +# -- old style +# Alias /nagios3/nagvis /usr/share/nagvis/htdocs # -- use basic authentification from nagios3 package # please adapt to your needs diff --git a/debian/patches/10_pathnames.dpatch b/debian/patches/10_pathnames.dpatch index 912513a..cc3453e 100755 --- a/debian/patches/10_pathnames.dpatch +++ b/debian/patches/10_pathnames.dpatch @@ -7,7 +7,7 @@ @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-27 18:35:57.000000000 +0100 ++++ trunk/etc/nagvis.ini.php-sample 2009-11-28 17:20:58.000000000 +0100 @@ -24,17 +24,20 @@ ; Path definitions @@ -66,19 +66,32 @@ diff -urNad trunk~/etc/nagvis.ini.php-sample trunk/etc/nagvis.ini.php-sample ; 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 -@@ -199,9 +202,9 @@ +@@ -198,37 +201,18 @@ + ; path to the cgi-bin of this backend ;htmlcgi="/nagios/cgi-bin" - ; in this example the ID of the Backend is "merlinmy_1" you can define another ID. +-; in this example the ID of the Backend is "merlinmy_1" you can define another ID. -[backend_merlinmy_1] -+;[backend_merlinmy_1] - ; type of backend - MUST be set +-; type of backend - MUST be set -backendtype="merlinmy" -+;backendtype="merlinmy" - ; hostname for Merlin db - ;dbhost="localhost" - ; portname for Merlin db -@@ -223,12 +226,12 @@ +-; hostname for Merlin db +-;dbhost="localhost" +-; portname for Merlin db +-;dbport=3306 +-; database name for Merlin db +-;dbname="merlin" +-; username for Merlin db +-;dbuser="merlin" +-; password for Merlin db +-;dbpass="merlin" +-; maximum delay of the Merlin Database in seconds +-;maxtimewithoutupdate=180 +-; path to the cgi-bin of this backend +-;htmlcgi="/nagios/cgi-bin" +- + ; ---------------------------- + ; Rotation pool definitions + ; ---------------------------- ; in this example the browser switches between the maps demo and demo2 every 15 ; seconds, the rotation is enabled by url: index.php?rotation=demo diff --git a/debian/postrm b/debian/postrm index fa212e6..3535fed 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for #PACKAGE# +# postrm script for nagvis # # see: dh_installdeb(1) @@ -9,7 +9,7 @@ if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule fi -if [ -f /usr/share/dbconfig-common/dpkg/postrm.@@DB@@ ]; then +if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then . /usr/share/dbconfig-common/dpkg/frontend.postrm.mysql dbc_go nagvis $@ fi @@ -48,8 +48,7 @@ if [ "$1" = "purge" ]; then # rm -f /etc/apache2/conf.d/nagvis.conf #fi - rm -f /var/cache/nagvis/* - rmdir /var/cache/nagvis + rm -rf /var/cache/nagvis fi # dh_installdeb will replace this with shell code automatically