debmon/pnp4nagios
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump

Browse Source
This commit is contained in:
Mario Fetka
2017-05-20 17:30:13 +02:00
parent 2594665299
commit 8327b61924
16 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/patches/apache-fix-path-to-userfile vendored
View File

@@ -9,7 +9,7 @@ Forwarded: not-needed
AuthName "Nagios Access"
AuthType Basic
- AuthUserFile /usr/local/nagios/etc/htpasswd.users
+ AuthUserFile /etc/nagios3/htpasswd.users
+ AuthUserFile /etc/nagios4/htpasswd.users
Require valid-user
<IfModule mod_rewrite.c>
# Turn on URL rewriting

16
debian/patches/config_instances vendored
View File

@@ -1,28 +1,28 @@
Description: Include a instance based config
Author: Markus Frosch <lazyfrosch@debian.org>
Last-Update: 2014-09-01
Last-Update: 2017-05-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sample-config/pnp/config.php.in
+++ b/sample-config/pnp/config.php.in
--- a/sample-config/pnp/config.php.in 2015-01-03 14:09:06.000000000 +0100
+++ b/sample-config/pnp/config.php.in 2017-05-20 17:21:56.852000000 +0200
@@ -89,7 +89,8 @@
#
# Link back to Nagios or Thruk ( www.thruk.org )
#
-$conf['nagios_base'] = "/cgi-bin/nagios3";
-$conf['nagios_base'] = "/nagios/cgi-bin";
+## Debian: please see /etc/pnp4nagios/config.<NAME>.php
+##$conf['nagios_base'] = "/cgi-bin/nagios3";
+##$conf['nagios_base'] = "/cgi-bin/nagios4";
#
# Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )
@@ -278,4 +279,10 @@
@@ -272,4 +273,10 @@
'#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
$scheme['mixed3'] = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
'#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
+
+if (file_exists('/etc/pnp4nagios/config.icinga.php')) {
+ include '/etc/pnp4nagios/config.icinga.php';
+} else if (file_exists('/etc/pnp4nagios/config.nagios3.php')) {
+ include '/etc/pnp4nagios/config.nagios3.php';
+} else if (file_exists('/etc/pnp4nagios/config.nagios4.php')) {
+ include '/etc/pnp4nagios/config.nagios4.php';
+}
?>

2
debian/patches/fix-nagios-url vendored
View File

@@ -9,7 +9,7 @@ Forwarded: not-needed
# Link back to Nagios or Thruk ( www.thruk.org )
#
-$conf['nagios_base'] = "/nagios/cgi-bin";
+$conf['nagios_base'] = "/cgi-bin/nagios3";
+$conf['nagios_base'] = "/cgi-bin/nagios4";
#
# Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )

6
debian/patches/fix-path-fpdi vendored
View File

@@ -2,9 +2,9 @@ Description: FPDI is shipped in its own subdirectory -- adopt path in pdf.php.
Author: Sven Velt <sven@velt.de>
Forwarded: not-needed
--- a/share/pnp/application/controllers/pdf.php
+++ b/share/pnp/application/controllers/pdf.php
@@ -268,7 +268,7 @@ class Pdf_Controller extends System_Cont
--- a/share/pnp/application/controllers/pdf.php 2015-01-03 14:09:06.000000000 +0100
+++ b/share/pnp/application/controllers/pdf.php 2017-05-20 15:37:12.472000000 +0200
@@ -259,7 +259,7 @@
*
*/
require Kohana::find_file('vendor/fpdf', 'fpdf');