[Pkg-nagios-changes] [pkg-nagvis] 04/08: Made packaging updates for 1.7.9

Markus Frosch lazyfrosch-guest at moszumanska.debian.org
Thu Dec 12 19:51:11 UTC 2013 

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.

commit cd9367aa675c37878041d9088536bbdb4905de46
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Dec 12 19:34:15 2013 +0100

    Made packaging updates for 1.7.9
---
 debian/demo_pool.ini.php        |  2 +-
 debian/nagvis-demos.install     | 16 +++-------------
 debian/nagvis.postinst          |  4 ++--
 debian/patches/config.patch     | 19 ++++++++++++++++++-
 debian/patches/remove-shell-swf |  6 +++---
 debian/rules                    | 29 ++++-------------------------
 6 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/debian/demo_pool.ini.php b/debian/demo_pool.ini.php
index 716dbf4..d3cb3a2 100644
--- a/debian/demo_pool.ini.php
+++ b/debian/demo_pool.ini.php
@@ -11,7 +11,7 @@
 ; You may also add external URLs as steps. Simply enclose the url using []
 ; instead of the map name. It is also possible to add automaps to rotations,
 ; add an @ sign before the automap name to add an automap to the rotation.
-maps="demo-germany,demo-ham-racks,demo-load,demo-muc-srv1"
+maps="demo-germany,demo-ham-racks,demo-load,demo-muc-srv1,demo-geomap,demo-automap"
 ; rotation interval (seconds)
 interval=5
 
diff --git a/debian/nagvis-demos.install b/debian/nagvis-demos.install
index 9f33b67..c76a160 100644
--- a/debian/nagvis-demos.install
+++ b/debian/nagvis-demos.install
@@ -1,14 +1,4 @@
 debian/demo_pool.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/maps/demo-germany.cfg etc/nagvis/maps/
-etc/maps/demo-load.cfg etc/nagvis/maps/
-etc/maps/demo-muc-srv1.cfg etc/nagvis/maps/
-share/userfiles/images/shapes/demo_traffic_load_legend.png var/cache/nagvis/userfiles/images/shapes/
-share/userfiles/images/shapes/demo-wan-cloud.png var/cache/nagvis/userfiles/images/shapes/
-share/userfiles/images/maps/demo-host.png var/cache/nagvis/userfiles/images/maps/
-share/userfiles/images/maps/demo-overview.png var/cache/nagvis/userfiles/images/maps/
-share/userfiles/images/maps/demo-ham-racks.png var/cache/nagvis/userfiles/images/maps/
-share/userfiles/images/maps/demo-germany.png var/cache/nagvis/userfiles/images/maps/
-share/userfiles/images/maps/demo-load.png var/cache/nagvis/userfiles/images/maps/
+etc/maps/demo*.cfg etc/nagvis/maps/
+share/userfiles/images/shapes/demo*.png var/cache/nagvis/userfiles/images/shapes/
+share/userfiles/images/maps/demo*.png var/cache/nagvis/userfiles/images/maps/
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index 2d83af3..83074e4 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -37,7 +37,7 @@ case "$1" in
                   -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/icinga/rw/live\"#" \
                   -e "s#\[rotation_demo\]#;\[rotation_demo\]#" \
                   -e "s#interval=15#;interval=15#" \
-                  -e "s#maps=\"demo-germany,demo-ham-racks,demo-load,demo-muc-srv1\"#;maps=\"demo-germany,demo-ham-racks,demo-load,demo-muc-srv1\"#" \
+                  -e "s#maps=\"\(.*\)\"#;maps=\"\1\"#" \
                   > "$nagvis_tmp"
                 chgrp www-data "$nagvis_tmp"
                 chmod g+rw "$nagvis_tmp"
@@ -73,7 +73,7 @@ case "$1" in
                   -e "s#;socket=\"unix:/usr/local/nagios/var/rw/live\"#socket=\"unix:/var/lib/nagios3/rw/live\"#" \
                   -e "s#\[rotation_demo\]#;\[rotation_demo\]#" \
                   -e "s#interval=15#;interval=15#" \
-                  -e "s#maps=\"demo-germany,demo-ham-racks,demo-load,demo-muc-srv1\"#;maps=\"demo-germany,demo-ham-racks,demo-load,demo-muc-srv1\"#" \
+                  -e "s#maps=\"\(.*\)\"#;maps=\"\1\"#" \
                   > "$nagvis_tmp"
                 chgrp www-data "$nagvis_tmp"
                 chmod g+rw "$nagvis_tmp"
diff --git a/debian/patches/config.patch b/debian/patches/config.patch
index 7daa96f..ee89062 100644
--- a/debian/patches/config.patch
+++ b/debian/patches/config.patch
@@ -1,6 +1,6 @@
 --- a/share/server/core/defines/global.php
 +++ b/share/server/core/defines/global.php
-@@ -78,11 +78,11 @@ define('DEBUGFILE', '../../../var/nagvis
+@@ -79,11 +79,11 @@
  // The last value wins.
  //
  // Path to the main configuration file
@@ -15,3 +15,20 @@
  
  // The directory below the NagVis root which is shared by the webserver
  define('HTDOCS_DIR', 'share');
+--- a/share/server/core/classes/GlobalMainCfg.php
++++ b/share/server/core/classes/GlobalMainCfg.php
+@@ -1344,10 +1344,10 @@
+      * @author 	Lars Michelsen <lars at vertical-visions.de>
+      */
+     private function setPathsByBase($base, $htmlBase) {
+-        $this->validConfig['paths']['cfg']['default']                = $base.'etc/';
+-        $this->validConfig['paths']['mapcfg']['default']             = $base.'etc/maps/';
+-        $this->validConfig['paths']['geomap']['default']             = $base.'etc/geomap';
+-        $this->validConfig['paths']['profiles']['default']           = $base.'etc/profiles';
++        $this->validConfig['paths']['cfg']['default']                = '/etc/nagvis/';
++        $this->validConfig['paths']['mapcfg']['default']             = '/etc/nagvis/maps/';
++        $this->validConfig['paths']['geomap']['default']             = '/etc/nagvis/geomap';
++        $this->validConfig['paths']['profiles']['default']           = '/etc/nagvis/profiles';
+ 
+         $this->validConfig['paths']['var']['default']                = $base.'var/';
+         $this->validConfig['paths']['sharedvar']['default']          = $base.HTDOCS_DIR.'/var/';
diff --git a/debian/patches/remove-shell-swf b/debian/patches/remove-shell-swf
index 93f6b2a..152407a 100644
--- a/debian/patches/remove-shell-swf
+++ b/debian/patches/remove-shell-swf
@@ -1,6 +1,6 @@
 --- a/share/frontend/nagvis-js/js/frontend.js
 +++ b/share/frontend/nagvis-js/js/frontend.js
-@@ -1432,8 +1432,8 @@ function parseOverviewGeomap() {
+@@ -1410,8 +1410,8 @@
          oTr.appendChild(oTd);
  
          // Link
@@ -11,7 +11,7 @@
  
          // Status image
          var oImg = document.createElement('img');
-@@ -1441,17 +1441,17 @@ function parseOverviewGeomap() {
+@@ -1419,17 +1419,17 @@
          oImg.src = oGeneralProperties.path_iconsets+'std_small_unknown.png';
          oImg.alt = 'geomap';
  
@@ -32,7 +32,7 @@
          br = null;
  
          // Only show map thumb when configured
-@@ -1464,8 +1464,8 @@ function parseOverviewGeomap() {
+@@ -1442,8 +1442,8 @@
              oImg = null;
          }
  
diff --git a/debian/rules b/debian/rules
index b19ca35..584df05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,19 +17,9 @@ override_dh_install:
 	# these files are shipped in the nagvis-demo package; but are installed in a more general rule for dh_install
 	# remove them from the nagvis package here
 	rm -f debian/nagvis/etc/nagvis/conf.d/demo.ini.php \
-		debian/nagvis/etc/nagvis/automaps/demo-overview.cfg \
-		debian/nagvis/etc/nagvis/maps/demo-ham-racks.cfg \
-		debian/nagvis/etc/nagvis/maps/demo-overview.cfg \
-		debian/nagvis/etc/nagvis/maps/demo-germany.cfg \
-		debian/nagvis/etc/nagvis/maps/demo-load.cfg \
-		debian/nagvis/etc/nagvis/maps/demo-muc-srv1.cfg \
-		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo-germany.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo-host.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo-overview.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo-ham-racks.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo-load.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/shapes/demo_traffic_load_legend.png \
-		debian/nagvis/var/cache/nagvis/userfiles/images/shapes/demo-wan-cloud.png
+		debian/nagvis/etc/nagvis/maps/demo*.cfg \
+		debian/nagvis/var/cache/nagvis/userfiles/images/maps/demo*.png \
+		debian/nagvis/var/cache/nagvis/userfiles/images/shapes/demo*.png
 	# these files are shiped in /var/cache/nagvis/userfiles
 	# they are installed by the more general copy of the content of
 	# /usr/share/nagvis/share
@@ -39,7 +29,7 @@ override_dh_install:
 	# correct directory permissions
 	chown www-data:www-data debian/nagvis/etc/nagvis
 	chown -R www-data:www-data debian/nagvis/etc/nagvis/maps
-	chown -R www-data:www-data debian/nagvis/etc/nagvis/automaps
+	chown -R www-data:www-data debian/nagvis/etc/nagvis/conf.d
 	chown -R www-data:www-data debian/nagvis/etc/nagvis/profiles
 	chown -R www-data:www-data debian/nagvis/var/cache/nagvis
 	# Fixing some lintian issues
@@ -61,14 +51,3 @@ override_dh_clean:
 	dh_clean
 	debconf-updatepo
 
-get-orig-source:
-	$(eval TMP := $(shell mktemp -d))
-	wget -q -O $(TMP)/nagvis-1.6.6.tar.gz "http://downloads.sourceforge.net/project/nagvis/NagVis%201.6/nagvis-1.6.6.tar.gz"
-	tar --directory $(TMP) -xzf $(TMP)/nagvis-1.6.6.tar.gz
-	rm -rf $(TMP)/nagvis-1.6.6/uifx/
-	rm -rf $(TMP)/nagvis-1.6.6/share/netmap/shell.swf
-	rm -rf $(TMP)/nagvis-1.6.6/share/netmap/shell.html
-	rm -rf $(TMP)/nagvis-1.6.6/share/netmap/modules/gmap/
-	mv $(TMP)/nagvis-1.6.6 $(TMP)/nagvis-1.6.6+dfsg.1
-	tar --directory $(TMP) -czf nagvis_1.6.6+dfsg.1.orig.tar.gz nagvis-1.6.6+dfsg.1
-	rm -rf $(TMP)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git

More information about the Pkg-nagios-changes mailing list