Repaid demo maps (missing backend)

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

diff --git a/debian/changelog b/debian/changelog
index cdc9d804b818554b1a7475a624abc488ee42f7c3..78a5b9dd69794dbf0a71053301f15be471b7fe69 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 nagvis (1:1.6.4-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 nagvis (1:1.6.4-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET

+  * Fix nagvis-demos: demo backend definition in
+    /etc/nagvis/conf.d/demo.ini.php of nagvis-demos was ignored, works if
+    shipped added to /etc/nagvis/conf.d/demo_pool.ini.php

 
 

- -- Alexander Reichle-Schmehl <tolimar@debian.org>  Mon, 05 Mar 2012 16:02:29 +0100
+ -- Alexander Reichle-Schmehl <tolimar@debian.org>  Mon, 05 Mar 2012 18:37:28 +0100

 
 nagvis (1:1.6.4-1) experimental; urgency=low
 
 
 nagvis (1:1.6.4-1) experimental; urgency=low
 

diff --git a/debian/demo_pool.ini.php b/debian/demo_pool.ini.php
index dfb4e498d0fbef38e190130516c7ae368af50f70..716dbf49eca7754583669201efeb28ad990c4dec 100644 (file)
--- a/debian/demo_pool.ini.php
+++ b/debian/demo_pool.ini.php
@@ -15,3 +15,10 @@ maps="demo-germany,demo-ham-racks,demo-load,demo-muc-srv1"
 ; rotation interval (seconds)
 interval=5
 
 ; rotation interval (seconds)
 interval=5
 

+; This file defines a backend instance of the Test backend
+; which is used by some demo maps. This can be removed when
+; you are not interested in the demo maps.
+
+[backend_demo]
+backendtype=Test
+

diff --git a/debian/nagvis-demos.install b/debian/nagvis-demos.install
index 8fa7fa1e66d62ac4dd666834820ad298007f56ff..9f33b67a968071eae812996f101e19ca009313b8 100644 (file)
--- a/debian/nagvis-demos.install
+++ b/debian/nagvis-demos.install
@@ -1,5 +1,4 @@
 debian/demo_pool.ini.php etc/nagvis/conf.d/
 debian/demo_pool.ini.php etc/nagvis/conf.d/

-etc/conf.d/demo.ini.php etc/nagvis/conf.d/

 etc/automaps/demo-overview.cfg etc/nagvis/automaps/
 etc/maps/demo-ham-racks.cfg etc/nagvis/maps/
 etc/maps/demo-overview.cfg etc/nagvis/maps/
 etc/automaps/demo-overview.cfg etc/nagvis/automaps/
 etc/maps/demo-ham-racks.cfg etc/nagvis/maps/
 etc/maps/demo-overview.cfg etc/nagvis/maps/