From c35ac681ca9343e045f07ba37fe4e29d4d2672c3 Mon Sep 17 00:00:00 2001 From: wob-guest Date: Sun, 6 Dec 2009 11:12:59 +0000 Subject: [PATCH] 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 --- debian/README.Debian | 2 +- debian/apache.conf | 4 ++-- debian/links | 2 ++ debian/rules | 6 +++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index a8b291a..198131d 100644 --- 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 Sat, 28 Nov 2009 12:00:00 +0200 diff --git a/debian/apache.conf b/debian/apache.conf index 90cac0c..a2933f6 100644 --- 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 - + 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 - + diff --git a/debian/links b/debian/links index 0f234fe..54f1423 100644 --- 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 ce276f5..d97f20f 100755 --- 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 -- 2.30.2