diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2017-08-29 18:47:04 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2017-09-02 10:19:45 +0100 |
| commit | f8beac1f75d377422eb6097b58abd235d8ed782d (patch) | |
| tree | 6bd14a87660847c0b9be350eb9f4dfc1ffd31fea /system/nagvis/patches | |
| parent | a27f2ba955f4caa88acafd337e1913d31e566349 (diff) | |
system/nagvis: Fixed build.
privacy.diff patch no longer applied (not needed) and
the docs needed tweaking.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system/nagvis/patches')
| -rw-r--r-- | system/nagvis/patches/global.diff | 36 | ||||
| -rw-r--r-- | system/nagvis/patches/privacy.diff | 22 |
2 files changed, 0 insertions, 58 deletions
diff --git a/system/nagvis/patches/global.diff b/system/nagvis/patches/global.diff deleted file mode 100644 index f544dd270e..0000000000 --- a/system/nagvis/patches/global.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- nagvis-1.8rc3/share/server/core/defines/global.php.orig 2015-02-18 01:38:00.696662555 +0100 -+++ nagvis-1.8rc3/share/server/core/defines/global.php 2015-02-18 01:40:33.052563023 +0100 -@@ -79,11 +79,11 @@ - // The last value wins. - // - // Path to the main configuration file --define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); --define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf'); -+define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php'); -+define('CONST_MAINCFG_CACHE', '/var/cache/nagvis/nagvis-conf'); - - // Path to the main configuration conf.d directory --define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); -+define('CONST_MAINCFG_DIR', '/etc/nagvis/conf.d'); - - // The directory below the NagVis root which is shared by the webserver - define('HTDOCS_DIR', 'share'); ---- nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php 2015-02-18 01:43:31.837753573 +0100 -@@ -1516,11 +1516,11 @@ - * @author Lars Michelsen <lars@vertical-visions.de> - */ - private function setPathsByBase($base, $htmlBase) { -- $this->validConfig['paths']['cfg']['default'] = $base.'etc/'; -- $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; -- $this->validConfig['paths']['geomap']['default'] = $base.'etc/geomap'; -- $this->validConfig['paths']['profiles']['default'] = $base.'etc/profiles'; -- $this->validConfig['global']['authorisation_group_perms_file']['default'] = $base.'etc/perms.db'; -+ $this->validConfig['paths']['cfg']['default'] = '/etc/nagvis/'; -+ $this->validConfig['paths']['mapcfg']['default'] = '/etc/nagvis/maps/'; -+ $this->validConfig['paths']['geomap']['default'] = '/etc/nagvis/geomap'; -+ $this->validConfig['paths']['profiles']['default'] = '/etc/nagvis/profiles'; -+ $this->validConfig['global']['authorisation_group_perms_file']['default'] = '/etc/nagvis/perms.db'; - - $this->validConfig['paths']['var']['default'] = $base.'var/'; - $this->validConfig['paths']['sharedvar']['default'] = $base.HTDOCS_DIR.'/var/'; diff --git a/system/nagvis/patches/privacy.diff b/system/nagvis/patches/privacy.diff deleted file mode 100644 index 02f85795f6..0000000000 --- a/system/nagvis/patches/privacy.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- nagvis-1.8rc3/docs/en_US/toc.html.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/docs/en_US/toc.html 2015-02-18 01:49:13.318570773 +0100 -@@ -74,7 +74,7 @@ - <p>(<font style="color:#ff0000;">*</font>) New in 1.8</p> - <div style="text-align:center;margin-top:20px;"> - <p><a href="http://www.nagvis.org" style="margin: 0px;" class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo" src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p> -- <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&type=1" style="margin: 0px;" /></a></p> -+ <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle">SourceForge.net</a></p> - </div> - </body> - </html> ---- nagvis-1.8rc3/docs/de_DE/toc.html.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/docs/de_DE/toc.html 2015-02-18 01:50:04.417197043 +0100 -@@ -77,7 +77,7 @@ - --> - <div style="text-align:center;margin-top:20px;"> - <p><a href="http://www.nagvis.org" style="margin: 0px;" class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo" src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p> -- <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&type=1" style="margin: 0px;" /></a></p> -+ <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle">SourceForge.net</a></p> - </div> - </body> - </html> |