From 134bf721d8d4b48f330cba5f1b35b419d89f00e6 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 3 Feb 2011 12:38:45 +0100 Subject: [PATCH] Cleaned up and documented patches. --- debian/patches/adjust-template-path | 10 ++++++---- debian/patches/apache-fix-path-to-userfile | 10 ++++++---- debian/patches/fix-nagios-url | 10 ++++++---- debian/patches/fix-npcd-path | 10 ++++++---- debian/patches/fix-path-fpdi | 10 ++++++---- debian/patches/raise-process-perfdata-timeout | 10 ++++++---- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/debian/patches/adjust-template-path b/debian/patches/adjust-template-path index 7c2abe4..8ef4ae9 100644 --- a/debian/patches/adjust-template-path +++ b/debian/patches/adjust-template-path @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/sample-config/pnp/config.php.in -=================================================================== ---- pkg-pnp4nagios.orig/sample-config/pnp/config.php.in 2011-01-24 23:37:42.251054015 +0100 -+++ pkg-pnp4nagios/sample-config/pnp/config.php.in 2011-01-24 23:38:08.707054015 +0100 +Description: Install templates into /etc/ rather than /usr/share/. +Author: Sven Velt +Forwarded: not-needed + +--- a/sample-config/pnp/config.php.in ++++ b/sample-config/pnp/config.php.in @@ -214,12 +214,12 @@ # Add your own template directories here # First match wins! diff --git a/debian/patches/apache-fix-path-to-userfile b/debian/patches/apache-fix-path-to-userfile index cb1f310..1e10b85 100644 --- a/debian/patches/apache-fix-path-to-userfile +++ b/debian/patches/apache-fix-path-to-userfile @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/sample-config/httpd.conf.in -=================================================================== ---- pkg-pnp4nagios.orig/sample-config/httpd.conf.in 2011-01-26 14:40:26.943054015 +0100 -+++ pkg-pnp4nagios/sample-config/httpd.conf.in 2011-01-26 14:40:40.599054016 +0100 +Description: Fix config directory in the sample httpd.conf. +Author: Sven Velt +Forwarded: not-needed + +--- a/sample-config/httpd.conf.in ++++ b/sample-config/httpd.conf.in @@ -11,7 +11,7 @@ # AuthName "Nagios Access" diff --git a/debian/patches/fix-nagios-url b/debian/patches/fix-nagios-url index f3a09d9..27568d7 100644 --- a/debian/patches/fix-nagios-url +++ b/debian/patches/fix-nagios-url @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/sample-config/pnp/config.php.in -=================================================================== ---- pkg-pnp4nagios.orig/sample-config/pnp/config.php.in 2011-01-26 14:17:43.971054016 +0100 -+++ pkg-pnp4nagios/sample-config/pnp/config.php.in 2011-01-26 14:17:57.167054016 +0100 +Description: Fix cgi-bin path in config.php. +Author: Sven Velt +Forwarded: not-needed + +--- a/sample-config/pnp/config.php.in ++++ b/sample-config/pnp/config.php.in @@ -73,7 +73,7 @@ # # Link back to Nagios or Thruk ( www.thruk.org ) diff --git a/debian/patches/fix-npcd-path b/debian/patches/fix-npcd-path index 404f186..e53b536 100644 --- a/debian/patches/fix-npcd-path +++ b/debian/patches/fix-npcd-path @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/sample-config/pnp/npcd.cfg-sample.in -=================================================================== ---- pkg-pnp4nagios.orig/sample-config/pnp/npcd.cfg-sample.in 2011-01-26 14:33:43.595054016 +0100 -+++ pkg-pnp4nagios/sample-config/pnp/npcd.cfg-sample.in 2011-01-26 14:36:53.351054016 +0100 +Description: Fix perfdata paths in npcd.cfg. +Author: Sven Velt +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 = # diff --git a/debian/patches/fix-path-fpdi b/debian/patches/fix-path-fpdi index ce5c8d9..23bf9d6 100644 --- a/debian/patches/fix-path-fpdi +++ b/debian/patches/fix-path-fpdi @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/share/pnp/application/controllers/pdf.php -=================================================================== ---- pkg-pnp4nagios.orig/share/pnp/application/controllers/pdf.php 2011-01-26 14:46:34.895054016 +0100 -+++ pkg-pnp4nagios/share/pnp/application/controllers/pdf.php 2011-01-26 14:46:45.583054015 +0100 +Description: FPDI is shipped in its own subdirectory -- adopt path in pdf.php. +Author: Sven Velt +Forwarded: not-needed + +--- a/share/pnp/application/controllers/pdf.php ++++ b/share/pnp/application/controllers/pdf.php @@ -267,7 +267,7 @@ * */ diff --git a/debian/patches/raise-process-perfdata-timeout b/debian/patches/raise-process-perfdata-timeout index 9a6628b..c01e72f 100644 --- a/debian/patches/raise-process-perfdata-timeout +++ b/debian/patches/raise-process-perfdata-timeout @@ -1,7 +1,9 @@ -Index: pkg-pnp4nagios/sample-config/pnp/process_perfdata.cfg-sample.in -=================================================================== ---- pkg-pnp4nagios.orig/sample-config/pnp/process_perfdata.cfg-sample.in 2011-01-26 14:39:08.995054016 +0100 -+++ pkg-pnp4nagios/sample-config/pnp/process_perfdata.cfg-sample.in 2011-01-26 14:39:14.327054015 +0100 +Description: Set timeout to 10s in process_perfdata.cfg. +Author: Sven Velt +Forwarded: not-needed + +--- a/sample-config/pnp/process_perfdata.cfg-sample.in ++++ b/sample-config/pnp/process_perfdata.cfg-sample.in @@ -6,7 +6,7 @@ # # process_perfdata.pl Timeout in seconds -- 2.30.2