| 1 |
axs 12/07/31 18:49:50 |
| 2 |
|
| 3 |
Added: nagvis-1.6.6-base-path.patch |
| 4 |
nagvis-1.6.6-global-definitions.patch |
| 5 |
Log: |
| 6 |
version bump for bug 324641 , thanks to spacefreak for testing ; dropped ~ppc keyword due to missing keyword on net-analyzer/mk-livestatus dep (bug 429088) |
| 7 |
|
| 8 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: nagvis-1.6.6-base-path.patch |
| 17 |
=================================================================== |
| 18 |
--- a/share/server/core/classes/GlobalMainCfg.php 2012-05-31 11:14:23.000000000 -0400 |
| 19 |
+++ b/share/server/core/classes/GlobalMainCfg.php 2012-05-31 11:17:10.000000000 -0400 |
| 20 |
@@ -1215,8 +1215,8 @@ |
| 21 |
* @author Roman Kyrylych <rkyrylych@×××.com> |
| 22 |
*/ |
| 23 |
private function getBasePath() { |
| 24 |
- // Go 3 levels up from nagvis/share/nagvis to nagvis base path |
| 25 |
- return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/'; |
| 26 |
+ // Go 2 levels up from share/nagvis to nagvis base path |
| 27 |
+ return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/'; |
| 28 |
// Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share |
| 29 |
// return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/'; |
| 30 |
} |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: nagvis-1.6.6-global-definitions.patch |
| 40 |
=================================================================== |
| 41 |
--- a/share/server/core/defines/global.php 2012-05-13 05:44:27.000000000 -0400 |
| 42 |
+++ b/share/server/core/defines/global.php 2012-05-31 11:20:39.000000000 -0400 |
| 43 |
@@ -64,7 +64,7 @@ |
| 44 |
define('DEBUGLEVEL', 6); |
| 45 |
|
| 46 |
// Path to the debug file |
| 47 |
-define('DEBUGFILE', '../../../var/nagvis-debug.log'); |
| 48 |
+define('DEBUGFILE', '../../var/nagvis-debug.log'); |
| 49 |
|
| 50 |
// It is possible to define a conf.d directory for splitting the main |
| 51 |
// configuration in several files. Only the values defined in the CONST_MAINCFG |
| 52 |
@@ -78,14 +78,14 @@ |
| 53 |
// The last value wins. |
| 54 |
// |
| 55 |
// Path to the main configuration file |
| 56 |
-define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); |
| 57 |
-define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf'); |
| 58 |
+define('CONST_MAINCFG', '../../etc/nagvis.ini.php'); |
| 59 |
+define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf'); |
| 60 |
|
| 61 |
// Path to the main configuration conf.d directory |
| 62 |
-define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); |
| 63 |
+define('CONST_MAINCFG_DIR', '../../etc/conf.d'); |
| 64 |
|
| 65 |
// The directory below the NagVis root which is shared by the webserver |
| 66 |
-define('HTDOCS_DIR', 'share'); |
| 67 |
+define('HTDOCS_DIR', ''); |
| 68 |
|
| 69 |
// Needed minimal PHP version |
| 70 |
define('CONST_NEEDED_PHP_VERSION', '5.0'); |
Archives