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

Imported Debian patch 0.6.24+dfsg1-4~bpo80+1

Browse Source
This commit is contained in:
Micah Anderson
2015-12-08 13:39:31 -05:00
committed by Mario Fetka
parent 32a360eca6
commit 69f960eb4a
52 changed files with 2348 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
debian/patches/adjust-template-path vendored Normal file
View File

@@ -0,0 +1,29 @@
Description: Install templates into /etc/ rather than /usr/share/.
Also, add support for templates.d directory.
Author: Sven Velt <sven@velt.de>, Sebastian Harl <tokkee@debian.org
Forwarded: not-needed
--- a/sample-config/pnp/config.php.in
+++ b/sample-config/pnp/config.php.in
@@ -230,13 +230,19 @@ $conf['RRD_DAEMON_OPTS'] = '';
# Add your own template directories here
# First match wins!
#$conf['template_dirs'][] = '/usr/local/check_mk/pnp-templates';
-$conf['template_dirs'][] = '@datarootdir@/templates';
+$conf['template_dirs'][] = '@sysconfdir@/templates';
+$templates_d = glob("/etc/pnp4nagios/templates.d/*", GLOB_ONLYDIR);
+if (is_array($templates_d) && (count($templates_d) > 0)) {
+ foreach ($templates_d as $dirname) {
+ $conf['template_dirs'][] = "$dirname";
+ }
+}
$conf['template_dirs'][] = '@datarootdir@/templates.dist';
#
# Directory to search for special templates
#
-$conf['special_template_dir'] = '@datarootdir@/templates.special';
+$conf['special_template_dir'] = '@sysconfdir@/templates.special';
#
# Regex to detect mobile devices

15
debian/patches/apache-fix-path-to-userfile vendored Normal file
View File

@@ -0,0 +1,15 @@
Description: Fix config directory in the sample httpd.conf.
Author: Sven Velt <sven@velt.de>
Forwarded: not-needed
--- a/sample-config/httpd.conf.in
+++ b/sample-config/httpd.conf.in
@@ -11,7 +11,7 @@
#
AuthName "Nagios Access"
AuthType Basic
- AuthUserFile /usr/local/nagios/etc/htpasswd.users
+ AuthUserFile /etc/nagios3/htpasswd.users
Require valid-user
<IfModule mod_rewrite.c>
# Turn on URL rewriting

28
debian/patches/config_instances vendored Normal file
View File

@@ -0,0 +1,28 @@
Description: Include a instance based config
Author: Markus Frosch <lazyfrosch@debian.org>
Last-Update: 2014-09-01
---
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
@@ -89,7 +89,8 @@
#
# Link back to Nagios or Thruk ( www.thruk.org )
#
-$conf['nagios_base'] = "/cgi-bin/nagios3";
+## Debian: please see /etc/pnp4nagios/config.<NAME>.php
+##$conf['nagios_base'] = "/cgi-bin/nagios3";
#
# Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )
@@ -278,4 +279,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';
+}
?>

15
debian/patches/fix-nagios-url vendored Normal file
View File

@@ -0,0 +1,15 @@
Description: Fix cgi-bin path in config.php.
Author: Sven Velt <sven@velt.de>
Forwarded: not-needed
--- a/sample-config/pnp/config.php.in
+++ b/sample-config/pnp/config.php.in
@@ -89,7 +89,7 @@ $conf['temp'] = "/var/tmp";
#
# Link back to Nagios or Thruk ( www.thruk.org )
#
-$conf['nagios_base'] = "/nagios/cgi-bin";
+$conf['nagios_base'] = "/cgi-bin/nagios3";
#
# Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )

24
debian/patches/fix-npcd-path vendored Normal file
View File

@@ -0,0 +1,24 @@
Description: Fix perfdata paths in npcd.cfg.
Author: Sven Velt <sven@velt.de>
Forwarded: not-needed
--- a/sample-config/pnp/npcd.cfg-sample.in
+++ b/sample-config/pnp/npcd.cfg-sample.in
@@ -76,7 +76,7 @@
# perfdata_spool_dir = </path/to/directory/>
#
-perfdata_spool_dir = @PERFDATA_SPOOL_DIR@
+perfdata_spool_dir = @PERFDATA_SPOOL_DIR@/npcd/
# Execute following command for each found file
@@ -163,7 +163,7 @@
# perfdata_file = </path/to/file>
#
-perfdata_file = @localstatedir@/perfdata.dump
+perfdata_file = @PERFDATA_SPOOL_DIR@/nagios/perfdata.dump
# perfdata_spool_filename - declare the destination

15
debian/patches/fix-path-fpdi vendored Normal file
View File

@@ -0,0 +1,15 @@
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
*
*/
require Kohana::find_file('vendor/fpdf', 'fpdf');
-require Kohana::find_file('vendor/fpdf', 'fpdi');
+require Kohana::find_file('vendor/fpdi', 'fpdi');
class PDF extends FPDI {
//Page header
function Header() {

26
debian/patches/hardening vendored Normal file
View File

@@ -0,0 +1,26 @@
Description: Fix use of flags in Makefiles
To pass all hardening flags to gcc.
Author: Markus Frosch <lazyfrosch@debian.org>
Last-Update: 2015-07-01
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,7 +83,7 @@
#
###############################
npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
- $(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
+ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ npcd.c $(NPCDOBJS) $(LDFLAGS) -lpthread
###############################
#
@@ -91,7 +91,7 @@
#
###############################
npcdmod.o: npcdmod.c
- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC
+ $(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC
###############################
#

16
debian/patches/install_opts vendored Normal file
View File

@@ -0,0 +1,16 @@
Description: Disable INSTALL_OPTS
Author: Markus Frosch <lazyfrosch@debian.org>
Last-Update: 2014-10-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@
AC_SUBST(nagios_grp)
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS=""
AC_SUBST(INSTALL_OPTS)
# Checks for programs.

23
debian/patches/privacy-warning vendored Normal file
View File

@@ -0,0 +1,23 @@
Description: Remove flattr link code from documentation
The code is actually not used, because the flattr JS stuff is not included.
.
But we are disabling it anyways.
Author: Markus Frosch <markus@lazyfrosch.de>
Last-Update: 2014-10-26
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/share/pnp/documents/de_DE/start.html
+++ b/share/pnp/documents/de_DE/start.html
@@ -12,12 +12,6 @@
</div>
<p>
-
-<div class="flattr_left"><a class="FlattrButton" style="display:none;" title="PNP Dokumentation" href="http://docs.pnp4nagios.org/de/pnp-0.6/start" rev="flattr;uid:44827;category:text;language:de;tags:;">PNP4Nagios Dokumentation Version 0.6.x[...]</a></div>
-</p>
-
-<p>
-
<a href="/_detail/pnp-0.6/gallery/pnp-preview-05-08-2009.png?id=de%3Apnp-0.6%3Astart" class="media" title="pnp-0.6:gallery:pnp-preview-05-08-2009.png"><img src="/_media/pnp-0.6/gallery/pnp-preview-05-08-2009.png?w=215" class="mediaright" align="right" title="Theme &quot;smoothness&quot;" alt="Theme &quot;smoothness&quot;" width="215" /></a>
</p>

9
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,9 @@
fix-path-fpdi
apache-fix-path-to-userfile
fix-npcd-path
fix-nagios-url
adjust-template-path
privacy-warning
config_instances
install_opts
hardening