From da1dc2ddc3f73acc8cd458be65459e4a035fc28d Mon Sep 17 00:00:00 2001 From: tolimar Date: Mon, 26 Sep 2011 14:29:53 +0000 Subject: [PATCH] config.dpatch updated git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1976 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- debian/changelog | 3 +- debian/patches/config.dpatch | 103 +++++++++++------------------------ 2 files changed, 34 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c86d07..7c316b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ nagvis (1:1.5.10-1) UNRELEASED; urgency=low * removed patches/fix-get_class-object.dpatch; no longer needed * removed patches/visibility_magic-set-method.dpatch; no longer needed * rework debian/rules and install files + * updated debian/config.patch - -- Alexander Reichle-Schmehl Mon, 26 Sep 2011 15:51:49 +0200 + -- Alexander Reichle-Schmehl Mon, 26 Sep 2011 16:29:25 +0200 nagvis (1:1.4.6-2) unstable; urgency=medium diff --git a/debian/patches/config.dpatch b/debian/patches/config.dpatch index 5cf9f6f..28f3886 100755 --- a/debian/patches/config.dpatch +++ b/debian/patches/config.dpatch @@ -5,19 +5,17 @@ ## DP: changes default configs @DPATCH@ -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 2011-09-07 14:19:01.000000000 +0200 -@@ -24,17 +24,27 @@ - +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.5.10~/etc/nagvis.ini.php-sample nagvis-1.5.10/etc/nagvis.ini.php-sample +--- nagvis-1.5.10~/etc/nagvis.ini.php-sample 2011-07-31 11:51:23.000000000 +0200 ++++ nagvis-1.5.10/etc/nagvis.ini.php-sample 2011-09-26 16:24:19.000000000 +0200 +@@ -108,7 +108,18 @@ ; Path definitions [paths] --; absolute physical NagVis path --;base="/usr/local/nagios/share/nagvis/" + ; absolute physical NagVis path +-;base="/usr/local/nagvis/" +base="/usr/share/nagvis/htdocs/" +cfg="/etc/nagvis/" +var="/var/cache/nagvis/" -+mapcfg="/etc/nagvis/maps/" +images="/var/lib/nagvis/images/" +icon="/var/lib/nagvis/images/iconsets/" +shape="/var/lib/nagvis/images/shapes/" @@ -26,76 +24,39 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' +hovertemplate="/etc/nagvis/templates/hover/" +contexttemplate="/etc/nagvis/templates/context/" +gadget="/etc/nagvis/gadgets" ++ ; absolute html NagVis path --;htmlbase="/nagios/nagvis" -+htmlbase="/nagvis" + ;htmlbase="/nagvis" ; absolute html NagVis cgi path --;htmlcgi="/nagios/cgi-bin" -+htmlcgi="/nagios3/cgi-bin" - - ; Default values which get inherited to the maps and its objects - [defaults] - ; default backend (id of the default backend) --;backend="ndomy_1" -+backend="ndomy_1" - ; background color of maps - ;backgroundcolor="#fff" - ; Enable/Disable the context menu on map objects. With the context menu you are -@@ -158,8 +168,8 @@ - ; ---------------------------- - - ; Example definition of a livestatus backend. In this case the backend_id is live_1 --[backend_live_1] --backendtype="mklivestatus" -+;[backend_live_1] -+;backendtype="mklivestatus" - ;socket="unix:/usr/local/nagios/var/rw/live" - +@@ -280,7 +291,7 @@ + ; The statushost needs to be given in the following format: + ; ":" -> e.g. "live_2:nagios" + ;statushost="" +-;socket="unix:/usr/local/nagios/var/rw/live" ++socket="unix:/var/lib/icinga/rw/live" + + ; Example definition for a MySQL backend ; in this example the ID of the Backend is "ndomy_1" you can define another ID. -@@ -186,9 +196,9 @@ - ;htmlcgi="/nagios/cgi-bin" - - ; in this example the ID of the Backend is "ndo2fs_1" you can define another ID. --[backend_ndo2fs_1] -+;[backend_ndo2fs_1] - ; type of backend - MUST be set --backendtype="ndo2fs" -+;backendtype="ndo2fs" - ; Path to the ndo2fs var directory where the VOLATILE and PERSISTENT directories are - ;path="/usr/local/ndo2fs/var" - ; Name of the instance to get the data from -@@ -223,12 +233,12 @@ - - ; in this example the browser switches between the maps demo and demo2 every 15 - ; seconds, the rotation is enabled by url: index.php?rotation=demo --[rotation_demo] -+;[rotation_demo] - ; These steps are rotated. The "Demo2:" is a label which is being displayed in - ; the index pages rotation list. --maps="demo,Demo2:demo2" -+;maps="demo,Demo2:demo2" - ; rotation interval (seconds) --interval=15 -+;interval=15 - - ; ------------------------------------------------------------------------------ - ; Below you find some advanced stuff -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 2011-09-07 14:18:33.000000000 +0200 -@@ -61,13 +61,13 @@ - define('DEBUGLEVEL', 4); +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.5.10~/share/server/core/defines/global.php nagvis-1.5.10/share/server/core/defines/global.php +--- nagvis-1.5.10~/share/server/core/defines/global.php 2011-07-31 11:51:23.000000000 +0200 ++++ nagvis-1.5.10/share/server/core/defines/global.php 2011-09-26 16:27:28.000000000 +0200 +@@ -64,7 +64,7 @@ + define('DEBUGLEVEL', 6); // Path to the debug file --define('DEBUGFILE', '../var/nagvis-debug.log'); +-define('DEBUGFILE', '../../../var/nagvis-debug.log'); +define('DEBUGFILE', '/var/log/nagvis-debug.log'); - // NagVis Version - define('CONST_VERSION', '1.4.6'); - + // It is possible to define a second main configuration file + // to pre-define some options in a file the user may not be +@@ -78,8 +78,8 @@ + // The last value wins. + // // Path to the main configuration file --define('CONST_MAINCFG', '../etc/nagvis.ini.php'); +-define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); +-define('CONST_MAINCFG_CACHE', '../../../var/nagvis.ini.php'); +define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php'); ++define('CONST_MAINCFG_CACHE', '/etc/nagvis/nagvis.ini.php'); - // Needed minimal PHP version - define('CONST_NEEDED_PHP_VERSION', '5.0'); + // Path to "site" main configuration file + //define('CONST_MAINCFG_SITE', '../../../etc/nagvis-site.ini.php'); -- 2.30.2