From 309e2df6085f7d5070637a1c66af3155b1900d9d Mon Sep 17 00:00:00 2001 From: wob-guest Date: Sun, 29 Nov 2009 13:13:18 +0000 Subject: [PATCH] rules cleanup todo: mv templates to /etc/nagvis git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1797 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- debian/README.Debian | 41 +++++++------------------ debian/changelog | 13 +++----- debian/dirs | 1 + debian/examples | 2 +- debian/install | 10 +++--- debian/{overrides => lintian-overrides} | 0 debian/rules | 38 +++-------------------- 7 files changed, 27 insertions(+), 78 deletions(-) rename debian/{overrides => lintian-overrides} (100%) diff --git a/debian/README.Debian b/debian/README.Debian index 9aefffc..a8b291a 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,17 @@ nagvis for Debian ----------------- +Starting with 1.4.5, there are changes from older packages. + +* URL and CGI-Path: +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 +/etc/nagvis/apache.conf and edit it for your needs. + + -- Wolfgang Barth Sat, 28 Nov 2009 12:00:00 +0200 + Thank you using the NagVis addon for Nagios Network Monitoring System. To get it work you have to be sure the ndoutils package is installed and works @@ -19,33 +30,3 @@ its owner and group to be www-data:www-data. -- Hendrik Frenzel Sat, 14 Jul 2007 11:27:33 +0200 -Starting with 1.4.5, there are changes from older packages. - -* URL and CGI-Path: -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 -/etc/nagvis/apache.conf and edit it for your needs. - -* Templates: -The template directory /etc/nagvis/templates has moved back to -/usr/share/nagvis/htdocs/nagvis/templates, images for templates now located in -/usr/share/nagvis/htdocs/nagvis/images/templates - -If you installed your own templates in /etc/nagvis/templates, proceed the -following steps: - -- cp /etc/nagios/templates/header/*.png \ - /usr/share/nagvis/htdocs/nagvis/images/templates/header/ - -- cp /etc/nagios/templates/hover/*.png \ - /usr/share/nagvis/htdocs/nagvis/images/templates/hover/ - -- /etc/nagios/templates/header/*.{css,html} - /usr/share/nagvis/htdocs/nagvis/templates/header/ - -- /etc/nagios/templates/hover/*.{css,html} - /usr/share/nagvis/htdocs/nagvis/templates/hover/ - - -- Wolfgang Barth Sat, 28 Nov 2009 12:00:00 +0200 diff --git a/debian/changelog b/debian/changelog index c939dbc..10a332e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,11 +12,10 @@ nagvis (1:1.4.5-1) UNRELEASED; urgency=low linked to /etc/apache2/conf.d * README.backends.Merlin added - -- Wolfgang Barth Sat, 28 Nov 2009 09:23:36 +0100 - -nagvis (1:1.4.4-1) UNRELEASED; urgency=low + [ Alexander Wirt ] + * New upstream version + * Add myself to uploaders - * NOT RELEASED YET [ Hendrik Frenzel ] * fixed include path names in nagvis/ajax_handler.php @@ -24,11 +23,7 @@ nagvis (1:1.4.4-1) UNRELEASED; urgency=low * Updating standards version to 3.8.3 - Add README.source - [ Alexander Wirt ] - * New upstream version - * Add myself to uploaders - - -- Alexander Wirt Tue, 24 Nov 2009 08:45:37 +0100 + -- Wolfgang Barth Sat, 28 Nov 2009 09:23:36 +0100 nagvis (1:1.3.1-3) unstable; urgency=low diff --git a/debian/dirs b/debian/dirs index 6ec1f2a..df1351b 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,5 @@ etc/nagvis/maps etc/nagvis/templates +var/lib/nagvis/images var/lib/nagvis/images/maps var/cache/nagvis diff --git a/debian/examples b/debian/examples index 4115939..bb3f378 100644 --- a/debian/examples +++ b/debian/examples @@ -1,2 +1,2 @@ -debian/tmp/demo +debian/nagvis/demo etc/nagvis.ini.php-sample diff --git a/debian/install b/debian/install index 9e319df..6453fb2 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,6 @@ -debian/tmp/etc/nagvis -debian/tmp/etc/nagvis/maps -debian/tmp/usr/share/nagvis -debian/tmp/usr/share/lintian/overrides +etc/* /etc/nagvis +nagvis/* /usr/share/nagvis/htdocs/nagvis +wui/* /usr/share/nagvis/htdocs/wui +index.php /usr/share/nagvis/htdocs +debian/apache.conf /usr/share/nagvis/debian +debian/apache.conf /etc/nagvis diff --git a/debian/overrides b/debian/lintian-overrides similarity index 100% rename from debian/overrides rename to debian/lintian-overrides diff --git a/debian/rules b/debian/rules index 16b8124..5ac8ae8 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 include /usr/share/dpatch/dpatch.make -DEST = debian/tmp +DEST = debian/nagvis configure: configure-stamp configure-stamp: @@ -31,18 +31,11 @@ install: build dh_testdir dh_testroot dh_clean -k - - install -d $(DEST)/etc/nagvis \ - $(DEST)/usr/share/nagvis/debian/ \ - $(DEST)/usr/share/nagvis/htdocs/nagvis/ \ - $(DEST)/usr/share/nagvis/htdocs/wui/ - - install -d $(DEST)/var/lib/nagvis/images/maps - install -d $(DEST)/var/cache/nagvis + dh_installdirs + dh_install [ -x /usr/bin/html2text ] && \ /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/Changelog - cp -a etc/* $(DEST)/etc/nagvis mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \ $(DEST)/usr/share/nagvis/debian/ sed -e 's/^[; ]*\(\