bugfix postrm; backend=merlin from nagvis.ini.php removed (see README.backend.merlin...

[pkg-nagvis.git] / debian / patches / 10_pathnames.dpatch

diff --git a/debian/patches/10_pathnames.dpatch b/debian/patches/10_pathnames.dpatch
index 912513abb27e0cb960bfc31f21668df5749f94d9..cc3453e362699d511f57e914a97ff723d73d5208 100755 (executable)
--- 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