[Pkg-nagios-changes] [pkg-nagios] r1802 - nagvis/trunk/debian

[Wolfgang Barth]

Author: wob-guest
Date: 2009-12-06 11:12:59 +0000 (Sun, 06 Dec 2009)
New Revision: 1802

Modified:
   nagvis/trunk/debian/README.Debian
   nagvis/trunk/debian/apache.conf
   nagvis/trunk/debian/links
   nagvis/trunk/debian/rules
Log:
remove .gitignore in image dirs; symlinks to nagios logos


Modified: nagvis/trunk/debian/README.Debian
===================================================================
--- nagvis/trunk/debian/README.Debian	2009-12-05 20:49:50 UTC (rev 1801)
+++ nagvis/trunk/debian/README.Debian	2009-12-06 11:12:59 UTC (rev 1802)
@@ -7,7 +7,7 @@
 Since nagvis now can be used with other systems like icinga or web interface 
 like ninja, the htdocs path is no longer part of nagios3 directory structure. 
 The new directory for nagvis is now /usr/share/nagvis/htdocs/nagvis. The 
-authentification therefore has to be configured separately. Have a look at 
+authentication therefore has to be configured separately. Have a look at 
 /etc/nagvis/apache.conf and edit it for your needs.
 
  -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200

Modified: nagvis/trunk/debian/apache.conf
===================================================================
--- nagvis/trunk/debian/apache.conf	2009-12-05 20:49:50 UTC (rev 1801)
+++ nagvis/trunk/debian/apache.conf	2009-12-06 11:12:59 UTC (rev 1802)
@@ -9,7 +9,7 @@
 
 # -- use basic authentification from nagios3 package
 #    please adapt to your needs
-<Directory /usr/share/nagvis/htdocs>
+<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
         Options FollowSymLinks
 	DirectoryIndex index.php
 
@@ -20,4 +20,4 @@
         AuthType Basic
         AuthUserFile /etc/nagios3/htpasswd.users
 	require valid-user
-</Directory>
+</DirectoryMatch>

Modified: nagvis/trunk/debian/links
===================================================================
--- nagvis/trunk/debian/links	2009-12-05 20:49:50 UTC (rev 1801)
+++ nagvis/trunk/debian/links	2009-12-06 11:12:59 UTC (rev 1802)
@@ -2,3 +2,5 @@
 var/lib/nagvis/images/maps usr/share/nagvis/htdocs/nagvis/images/maps
 var/cache/nagvis usr/share/nagvis/htdocs/var
 etc/nagvis/apache.conf etc/apache2/conf.d/nagvis.conf 
+usr/share/nagios/htdocs/images/logos/logos /var/lib/nagvis/images/shapes/logos
+usr/share/nagios/htdocs/images/logos/base /var/lib/nagvis/images/shapes/base

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2009-12-05 20:49:50 UTC (rev 1801)
+++ nagvis/trunk/debian/rules	2009-12-06 11:12:59 UTC (rev 1802)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# debian/rules makefile for nagvis
+# Last modified:
+# $Id$
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -36,6 +38,8 @@
 	dh_install
 
 	# -- images to /var 
+	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/.gitignore
+	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/*/.gitignore
 	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/* $(DEST)/var/lib/nagvis/images/.
 
         # -- templates