remove .gitignore in image dirs; symlinks to nagios logos

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

diff --git a/debian/README.Debian b/debian/README.Debian
index a8b291ad73d4972fcd62bd756b07e92809ca3e4c..198131d8e65531f4f127284d882c31d1d067a810 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,7 +7,7 @@ Starting with 1.4.5, there are changes from older packages.
 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@swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200

diff --git a/debian/apache.conf b/debian/apache.conf
index 90cac0caeded59c339eb9fd0f8a47bf248880b3a..a2933f6ca9df9549c14b143071c13e29684a4628 100644 (file)
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -9,7 +9,7 @@ Alias /nagvis /usr/share/nagvis/htdocs
 
 # -- 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 @@ Alias /nagvis /usr/share/nagvis/htdocs
         AuthType Basic
         AuthUserFile /etc/nagios3/htpasswd.users
        require valid-user
-</Directory>
+</DirectoryMatch>

diff --git a/debian/links b/debian/links
index 0f234fe04b0b5a7320f29751f26ad861ec2b56b5..54f1423e5af5ab9106faa6ff5291d549c4dbf5e7 100644 (file)
--- a/debian/links
+++ b/debian/links
@@ -2,3 +2,5 @@ etc/nagvis/maps usr/share/nagvis/htdocs/nagvis/etc/maps
 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

diff --git a/debian/rules b/debian/rules
index ce276f56b8cee69a290d5f1a1dfd185c144084b2..d97f20fb2d3c492f1df508146a194e47c9821e3f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ install: build
        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