From 8327b61924fc87b064a211ca84cc823266d7bff9 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 20 May 2017 17:30:13 +0200 Subject: [PATCH] Bump --- debian/changelog | 6 ++++++ debian/control | 14 +++++++------- debian/nagios3/config.nagios3.php | 2 -- debian/nagios4/config.nagios4.php | 2 ++ debian/{nagios3 => nagios4}/pnp4nagios.conf | 2 +- debian/patches/apache-fix-path-to-userfile | 2 +- debian/patches/config_instances | 16 ++++++++-------- debian/patches/fix-nagios-url | 2 +- debian/patches/fix-path-fpdi | 6 +++--- debian/pnp4nagios-bin.postinst | 6 +++--- debian/pnp4nagios-bin.postrm | 8 ++++---- debian/pnp4nagios-web-config-nagios3.install | 2 -- debian/pnp4nagios-web-config-nagios4.install | 2 ++ ...4nagios-web-config-nagios4.lintian-overrides} | 2 +- ...st => pnp4nagios-web-config-nagios4.postinst} | 2 +- ...strm => pnp4nagios-web-config-nagios4.postrm} | 2 +- 16 files changed, 41 insertions(+), 35 deletions(-) delete mode 100644 debian/nagios3/config.nagios3.php create mode 100644 debian/nagios4/config.nagios4.php rename debian/{nagios3 => nagios4}/pnp4nagios.conf (94%) delete mode 100644 debian/pnp4nagios-web-config-nagios3.install create mode 100644 debian/pnp4nagios-web-config-nagios4.install rename debian/{pnp4nagios-web-config-nagios3.lintian-overrides => pnp4nagios-web-config-nagios4.lintian-overrides} (92%) rename debian/{pnp4nagios-web-config-nagios3.postinst => pnp4nagios-web-config-nagios4.postinst} (97%) rename debian/{pnp4nagios-web-config-nagios3.postrm => pnp4nagios-web-config-nagios4.postrm} (96%) diff --git a/debian/changelog b/debian/changelog index d1d5755..b882e48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pnp4nagios (0.6.25-1) UNRELEASED; urgency=medium + + * Bump to new upstream verison + + -- Mario Fetka Sat, 20 May 2017 17:29:18 +0200 + pnp4nagios (0.6.24+dfsg1-4~bpo80+1) jessie-backports; urgency=medium * Backport to jessie-backports. diff --git a/debian/control b/debian/control index 8cbdad6..5327205 100644 --- a/debian/control +++ b/debian/control @@ -44,7 +44,7 @@ Depends: ${shlibs:Depends}, librrds-perl, adduser -Recommends: pnp4nagios-web, icinga | nagios3 +Recommends: pnp4nagios-web, icinga | nagios4 Suggests: rrdtool, rrdcached, perl, libgearman-client-perl, libcrypt-rijndael-perl Description: monitoring addon to create graphs from performance data - binaries PNP is a graphing tool for Nagios, Icinga or similar frameworks that @@ -62,7 +62,7 @@ Architecture: all Depends: pnp4nagios-web (=${source:Version}), ${misc:Depends} Recommends: apache2 | httpd Suggests: icinga, icinga-cgi -Conflicts: pnp4nagios-web-config-nagios3 +Conflicts: pnp4nagios-web-config-nagios4 Replaces: pnp4nagios-web (<< 0.6.21) Description: monitoring addon to create graphs from performance data - Icinga Classic config PNP is a graphing tool for Nagios, Icinga or similar frameworks that @@ -75,14 +75,14 @@ Description: monitoring addon to create graphs from performance data - Icinga Cl . This package contains the icinga-cgi configuration for pnp4nagios-web. -Package: pnp4nagios-web-config-nagios3 +Package: pnp4nagios-web-config-nagios4 Architecture: all Depends: pnp4nagios-web (=${source:Version}), ${misc:Depends} Recommends: apache2 | httpd -Suggests: nagios3, nagios3-cgi +Suggests: nagios4, nagios4-cgi Conflicts: pnp4nagios-web-config-icinga Replaces: pnp4nagios-web (<< 0.6.21) -Description: monitoring addon to create graphs from performance data - Nagios3 CGI config +Description: monitoring addon to create graphs from performance data - nagios4 CGI config PNP is a graphing tool for Nagios, Icinga or similar frameworks that analyzes performance data provided by plugins and stores them automatically into Round Robin Databases (RRD). @@ -91,7 +91,7 @@ Description: monitoring addon to create graphs from performance data - Nagios3 C . PNP's goal is to be easily configurable and maintainable. . - This package contains the nagios3-cgi configuration for pnp4nagios-web. + This package contains the nagios4-cgi configuration for pnp4nagios-web. Package: pnp4nagios-web Architecture: all @@ -106,7 +106,7 @@ Depends: libjs-jquery-mobile, rrdtool, adduser -Recommends: pnp4nagios-bin, pnp4nagios-web-config-icinga | pnp4nagios-web-config-nagios3 +Recommends: pnp4nagios-bin, pnp4nagios-web-config-icinga | pnp4nagios-web-config-nagios4 Suggests: rrdcached Description: monitoring addon to create graphs from performance data - web interface PNP is a graphing tool for Nagios, Icinga or similar frameworks that diff --git a/debian/nagios3/config.nagios3.php b/debian/nagios3/config.nagios3.php deleted file mode 100644 index d887841..0000000 --- a/debian/nagios3/config.nagios3.php +++ /dev/null @@ -1,2 +0,0 @@ - # Turn on URL rewriting diff --git a/debian/patches/apache-fix-path-to-userfile b/debian/patches/apache-fix-path-to-userfile index 1e10b85..9c981b8 100644 --- a/debian/patches/apache-fix-path-to-userfile +++ b/debian/patches/apache-fix-path-to-userfile @@ -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 # Turn on URL rewriting diff --git a/debian/patches/config_instances b/debian/patches/config_instances index 13b6600..32be6a9 100644 --- a/debian/patches/config_instances +++ b/debian/patches/config_instances @@ -1,28 +1,28 @@ Description: Include a instance based config Author: Markus Frosch -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..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'; +} ?> diff --git a/debian/patches/fix-nagios-url b/debian/patches/fix-nagios-url index 84419a4..b24804a 100644 --- a/debian/patches/fix-nagios-url +++ b/debian/patches/fix-nagios-url @@ -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 ) diff --git a/debian/patches/fix-path-fpdi b/debian/patches/fix-path-fpdi index c17addb..9daf9e1 100644 --- a/debian/patches/fix-path-fpdi +++ b/debian/patches/fix-path-fpdi @@ -2,9 +2,9 @@ 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 -@@ -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'); diff --git a/debian/pnp4nagios-bin.postinst b/debian/pnp4nagios-bin.postinst index 6c0b1b6..e86ae96 100644 --- a/debian/pnp4nagios-bin.postinst +++ b/debian/pnp4nagios-bin.postinst @@ -47,9 +47,9 @@ case "$1" in setperm root nagios 640 /etc/pnp4nagios/process_perfdata.cfg - if [ -d /etc/nagios3/conf.d/ ]; then - if [ ! -e /etc/nagios3/conf.d/pnp4nagios.cfg ]; then - ln -s /etc/pnp4nagios/nagios.cfg /etc/nagios3/conf.d/pnp4nagios.cfg + if [ -d /etc/nagios4/conf.d/ ]; then + if [ ! -e /etc/nagios4/conf.d/pnp4nagios.cfg ]; then + ln -s /etc/pnp4nagios/nagios.cfg /etc/nagios4/conf.d/pnp4nagios.cfg fi fi if [ -d /etc/icinga/objects/ ]; then diff --git a/debian/pnp4nagios-bin.postrm b/debian/pnp4nagios-bin.postrm index 369f60b..13213a5 100644 --- a/debian/pnp4nagios-bin.postrm +++ b/debian/pnp4nagios-bin.postrm @@ -21,11 +21,11 @@ set -e case "$1" in purge|remove) - if [ -d /etc/nagios3/conf.d/ ]; then - if [ -L /etc/nagios3/conf.d/pnp4nagios.cfg ]; then - ls -l /etc/nagios3/conf.d/pnp4nagios.cfg | grep -q /etc/pnp4nagios/nagios.cfg + if [ -d /etc/nagios4/conf.d/ ]; then + if [ -L /etc/nagios4/conf.d/pnp4nagios.cfg ]; then + ls -l /etc/nagios4/conf.d/pnp4nagios.cfg | grep -q /etc/pnp4nagios/nagios.cfg if [ $? -eq 0 ]; then - rm -f /etc/nagios3/conf.d/pnp4nagios.cfg + rm -f /etc/nagios4/conf.d/pnp4nagios.cfg fi fi fi diff --git a/debian/pnp4nagios-web-config-nagios3.install b/debian/pnp4nagios-web-config-nagios3.install deleted file mode 100644 index d767274..0000000 --- a/debian/pnp4nagios-web-config-nagios3.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/nagios3/config.nagios3.php etc/pnp4nagios -debian/nagios3/pnp4nagios.conf etc/apache2/conf-available diff --git a/debian/pnp4nagios-web-config-nagios4.install b/debian/pnp4nagios-web-config-nagios4.install new file mode 100644 index 0000000..e3f28d2 --- /dev/null +++ b/debian/pnp4nagios-web-config-nagios4.install @@ -0,0 +1,2 @@ +debian/nagios4/config.nagios4.php etc/pnp4nagios +debian/nagios4/pnp4nagios.conf etc/apache2/conf-available diff --git a/debian/pnp4nagios-web-config-nagios3.lintian-overrides b/debian/pnp4nagios-web-config-nagios4.lintian-overrides similarity index 92% rename from debian/pnp4nagios-web-config-nagios3.lintian-overrides rename to debian/pnp4nagios-web-config-nagios4.lintian-overrides index c317999..3ca64a5 100644 --- a/debian/pnp4nagios-web-config-nagios3.lintian-overrides +++ b/debian/pnp4nagios-web-config-nagios4.lintian-overrides @@ -4,4 +4,4 @@ apache2-reverse-dependency-calls-invoke-rc.d postrm apache2-reverse-dependency-calls-wrapper-script postinst a2enmod apache2-reverse-dependency-calls-invoke-rc.d postinst # we actually want that -non-standard-apache2-configuration-name pnp4nagios.conf != pnp4nagios-web-config-nagios3.conf +non-standard-apache2-configuration-name pnp4nagios.conf != pnp4nagios-web-config-nagios4.conf diff --git a/debian/pnp4nagios-web-config-nagios3.postinst b/debian/pnp4nagios-web-config-nagios4.postinst similarity index 97% rename from debian/pnp4nagios-web-config-nagios3.postinst rename to debian/pnp4nagios-web-config-nagios4.postinst index ed0aa5d..3a720fa 100644 --- a/debian/pnp4nagios-web-config-nagios3.postinst +++ b/debian/pnp4nagios-web-config-nagios4.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for pnp4nagios-web-config-nagios3 +# postinst script for pnp4nagios-web-config-nagios4 # # see: dh_installdeb(1) diff --git a/debian/pnp4nagios-web-config-nagios3.postrm b/debian/pnp4nagios-web-config-nagios4.postrm similarity index 96% rename from debian/pnp4nagios-web-config-nagios3.postrm rename to debian/pnp4nagios-web-config-nagios4.postrm index 60c4666..322c217 100644 --- a/debian/pnp4nagios-web-config-nagios3.postrm +++ b/debian/pnp4nagios-web-config-nagios4.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for pnp4nagios-web-config-nagios3 +# postrm script for pnp4nagios-web-config-nagios4 # # see: dh_installdeb(1)