From 3a4589e0aaad86d1fd7b8ebea77f847c018b3ee7 Mon Sep 17 00:00:00 2001 From: tolimar Date: Wed, 7 Sep 2011 12:23:13 +0000 Subject: [PATCH] Set gadget path in configuration file git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1944 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- debian/changelog | 7 +++++-- debian/patches/config.dpatch | 11 ++++++----- debian/rules | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a4ea0f..4082f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ nagvis (1:1.4.6-2) UNRELEASED; urgency=medium * Add myself to uploaders * Only call ucf on purge if it's available (Closes: #620037) * Set urgency to medium due to RC bug fix - - -- Alexander Reichle-Schmehl Wed, 07 Sep 2011 14:02:20 +0200 + * Set Path to gadget files in example configuration (via + patches/config.dpatch) and activate default configuration + (Closes: #611909) + + -- Alexander Reichle-Schmehl Wed, 07 Sep 2011 14:21:29 +0200 nagvis (1:1.4.6-1.1) unstable; urgency=low diff --git a/debian/patches/config.dpatch b/debian/patches/config.dpatch index b02c730..5cf9f6f 100755 --- a/debian/patches/config.dpatch +++ b/debian/patches/config.dpatch @@ -5,10 +5,10 @@ ## DP: changes default configs @DPATCH@ -diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample --- nagvis-1.4.6~/etc/nagvis.ini.php-sample 2010-02-04 21:51:13.000000000 +0100 -+++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2010-03-01 18:40:01.000000000 +0100 -@@ -24,17 +24,26 @@ ++++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2011-09-07 14:19:01.000000000 +0200 +@@ -24,17 +24,27 @@ ; Path definitions [paths] @@ -25,6 +25,7 @@ diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini. +headertemplate="/etc/nagvis/templates/header/" +hovertemplate="/etc/nagvis/templates/hover/" +contexttemplate="/etc/nagvis/templates/context/" ++gadget="/etc/nagvis/gadgets" ; absolute html NagVis path -;htmlbase="/nagios/nagvis" +htmlbase="/nagvis" @@ -79,9 +80,9 @@ diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini. ; ------------------------------------------------------------------------------ ; Below you find some advanced stuff -diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php --- nagvis-1.4.6~/nagvis/includes/defines/global.php 2010-02-04 21:51:13.000000000 +0100 -+++ nagvis-1.4.6/nagvis/includes/defines/global.php 2010-03-01 18:39:30.000000000 +0100 ++++ nagvis-1.4.6/nagvis/includes/defines/global.php 2011-09-07 14:18:33.000000000 +0200 @@ -61,13 +61,13 @@ define('DEBUGLEVEL', 4); diff --git a/debian/rules b/debian/rules index aff715c..52ce134 100755 --- a/debian/rules +++ b/debian/rules @@ -51,6 +51,8 @@ install: build [ -x /usr/bin/html2text ] && \ /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \ + $(DEST)/etc/nagvis/nagvis.ini.php + cp $(DEST)/etc/nagvis/nagvis.ini.php-sample \ $(DEST)/usr/share/nagvis/debian/ sed -e 's/^[; ]*\(\