[Pkg-nagios-changes] [pkg-nagios] r1208 - in nagiosgrapher/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Sat Aug 18 12:17:56 UTC 2007
tags 437124 pending
thanks
Author: hfrenzel-guest
Date: 2007-08-18 12:17:55 +0000 (Sat, 18 Aug 2007)
New Revision: 1208
Added:
nagiosgrapher/trunk/debian/patches/checks.dpatch
Modified:
nagiosgrapher/trunk/debian/changelog
nagiosgrapher/trunk/debian/control
nagiosgrapher/trunk/debian/copyright
nagiosgrapher/trunk/debian/dirs
nagiosgrapher/trunk/debian/patches/00list
nagiosgrapher/trunk/debian/patches/debian.dpatch
nagiosgrapher/trunk/debian/patches/nmgraph.dpatch
nagiosgrapher/trunk/debian/postinst.in
nagiosgrapher/trunk/debian/rules
Log:
updated to new upstream release
Modified: nagiosgrapher/trunk/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/changelog 2007-08-18 12:17:55 UTC (rev 1208)
@@ -1,3 +1,9 @@
+nagiosgrapher (1.6.1rc5-1) unstable; urgency=low
+
+ * Updates upstream release (Closes: #437124)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Sat, 18 Aug 2007 00:31:55 +0200
+
nagiosgrapher (1.6.1rc3-2) unstable; urgency=low
* Fixed some lintian warnings.
Modified: nagiosgrapher/trunk/debian/control
===================================================================
--- nagiosgrapher/trunk/debian/control 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/control 2007-08-18 12:17:55 UTC (rev 1208)
@@ -7,7 +7,7 @@
Package: nagiosgrapher
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, ttf-dejavu, rrdtool, librrds-perl, libgd-gd2-perl, libimage-magick-perl, libcalendar-simple-perl, liburi-perl, nagios2
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, ttf-dejavu, rrdtool, librrds-perl, libgd-gd2-perl, libimage-magick-perl, libcalendar-simple-perl, liburi-perl, nagios2, nagios-images
Suggests: netcat
Description: Charting add-on for Nagios
The "NETWAYS Nagios Grapher" is a Graphing system which uses templates to
Modified: nagiosgrapher/trunk/debian/copyright
===================================================================
--- nagiosgrapher/trunk/debian/copyright 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/copyright 2007-08-18 12:17:55 UTC (rev 1208)
@@ -5,7 +5,8 @@
Upstream Authors:
- Gerd Müller <gmueller at netways.de>
+ Gerd Mueller <gmueller at netways.de>
+ Christian Doebler <cdoebler at netways.de>
Copyright:
Modified: nagiosgrapher/trunk/debian/dirs
===================================================================
--- nagiosgrapher/trunk/debian/dirs 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/dirs 2007-08-18 12:17:55 UTC (rev 1208)
@@ -2,3 +2,4 @@
usr/share/nagios2/htdocs/images/logos
var/cache/nagiosgrapher
usr/lib/cgi-bin/nagios2
+etc/nagios2/serviceext
Modified: nagiosgrapher/trunk/debian/patches/00list
===================================================================
--- nagiosgrapher/trunk/debian/patches/00list 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/patches/00list 2007-08-18 12:17:55 UTC (rev 1208)
@@ -1,3 +1,3 @@
debian
nmgraph
-
+checks
Added: nagiosgrapher/trunk/debian/patches/checks.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/checks.dpatch (rev 0)
+++ nagiosgrapher/trunk/debian/patches/checks.dpatch 2007-08-18 12:17:55 UTC (rev 1208)
@@ -0,0 +1,91 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## check_mailq.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_load.ncfg_disabled nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_load.ncfg_disabled
+--- nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_load.ncfg_disabled 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_load.ncfg_disabled 2007-08-18 13:12:51.000000000 +0200
+@@ -5,10 +5,10 @@
+
+ define ngraph{
+ service_name LOAD
+- graph_log_regex ,(\d+\.\d+)($|critical|warning)
+- graph_value1 5min
++ graph_log_regex ,\s+(\d+\.\d+)($|critical|warning)
++ graph_value 15min
+ graph_units load
+- graph_legend 15minavgload:
++ graph_legend 15min avg load:
+ graph_legend_max 15
+ rrd_plottype AREA
+ rrd_color EACC00
+@@ -44,7 +44,7 @@
+
+ define ngraph{
+ service_name LOAD
+- graph_log_regex ,(\d+\.\d+),
++ graph_log_regex ,\s+(\d+\.\d+),
+ graph_value 5min
+ graph_units load
+ graph_legend 5min avg load:
+@@ -83,9 +83,9 @@
+
+ define ngraph{
+ service_name LOAD
+- graph_log_regex :(\d+\.\d+),
+- graph_value1min
+- graph_unitsload
++ graph_log_regex :\s+(\d+\.\d+),
++ graph_value 1min
++ graph_units load
+ graph_legend 1min avg load:
+ graph_legend_max 15
+ rrd_plottype STACK
+@@ -152,4 +152,4 @@
+ hide no
+ }
+
+-#[EOF]
+\ No newline at end of file
++#[EOF]
+diff -urNad nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_mailq.ncfg_disabled nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_mailq.ncfg_disabled
+--- nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_mailq.ncfg_disabled 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_mailq.ncfg_disabled 2007-08-18 13:12:51.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ #Mailq
+ define ngraph{
+- service_namem mailq
++ service_name mailq
+ graph_perf_regex mailq=(\d+)
+ graph_value mailq
+ graph_units mails
+@@ -25,4 +25,4 @@
+ hide no
+ }
+
+-#[EOF]
+\ No newline at end of file
++#[EOF]
+diff -urNad nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_users.ncfg_disabled nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_users.ncfg_disabled
+--- nagiosgrapher-1.6.1rc5~/cfg/templates/standard/check_users.ncfg_disabled 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/templates/standard/check_users.ncfg_disabled 2007-08-18 13:13:06.000000000 +0200
+@@ -3,7 +3,7 @@
+ #Author:MariusHein
+ #---
+
+-definengraph{
++define ngraph{
+ service_name USERS
+ graph_log_regex ([0-9]+)\s*users
+ graph_value user
+@@ -13,4 +13,4 @@
+ rrd_color 0066c0
+ }
+
+-#[EOF]
+\ No newline at end of file
++#[EOF]
Property changes on: nagiosgrapher/trunk/debian/patches/checks.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: nagiosgrapher/trunk/debian/patches/debian.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/debian.dpatch 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/patches/debian.dpatch 2007-08-18 12:17:55 UTC (rev 1208)
@@ -5,167 +5,169 @@
## DP: No description.
@DPATCH@
-diff -urNad nagiosgrapher-1.6.1rc3~/Makefile.in nagiosgrapher-1.6.1rc3/Makefile.in
---- nagiosgrapher-1.6.1rc3~/Makefile.in 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/Makefile.in 2007-07-23 21:43:11.000000000 +0200
-@@ -135,17 +135,17 @@
+diff -urNad nagiosgrapher-1.6.1rc5~/Makefile.in nagiosgrapher-1.6.1rc5/Makefile.in
+--- nagiosgrapher-1.6.1rc5~/Makefile.in 2007-08-15 12:23:17.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/Makefile.in 2007-08-18 14:10:31.000000000 +0200
+@@ -160,52 +160,52 @@
+ @exit 1
dirs:
- mkdir -p $(DESTDIR)/$(NG_SRVEXT_DIR)
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR)
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR)
- mkdir -p $(DESTDIR)/$(NG_RRD)
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD)
-- mkdir -p $(DESTDIR)/etc/init.d
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD)
-+ #mkdir -p $(DESTDIR)/etc/init.d
- mkdir -p `dirname $(DESTDIR)/$(NG_LOGFILE)`
- mkdir -p $(DESTDIR)/$(NG_DAEMON)
- mkdir -p $(DESTDIR)/$(NG_RRD)
+- mkdir -p $(NG_SRVEXT_DIR)
+- chown -R $(NAGIOS_PROC_USER) $(NG_SRVEXT_DIR)
+- mkdir -p $(NG_RRD)
+- chown -R $(NAGIOS_PROC_USER) $(NG_RRD)
+- mkdir -p $(NG_INIT_SCRIPT_DIR)
+- mkdir -p `dirname $(NG_LOGFILE)`
+- mkdir -p $(NG_DAEMON)
+- mkdir -p $(NG_RRD)
++ mkdir -p i$(DESTDIR)/$(NG_SRVEXT_DIR)
++ #chown -R $(NAGIOS_PROC_USER) $(NG_SRVEXT_DIR)
++ mkdir -p $(DESTDIR)/$(NG_RRD)
++ #chown -R $(NAGIOS_PROC_USER) $(NG_RRD)
++ #mkdir -p $(NG_INIT_SCRIPT_DIR)
++ mkdir -p `dirname $(DESTDIR)/$(NG_LOGFILE)`
++ mkdir -p $(DESTDIR)/$(NG_DAEMON)
++ mkdir -p $(DESTDIR)/$(NG_RRD)
logfile:
-- touch $(DESTDIR)/$(NG_LOGFILE)
-- chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE)
-+ #touch $(DESTDIR)/$(NG_LOGFILE)
-+ #chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE)
+- touch $(NG_LOGFILE)
+- chown $(NAGIOS_PROC_USER) $(NG_LOGFILE)
++ #touch $(NG_LOGFILE)
++ #chown $(NAGIOS_PROC_USER) $(NG_LOGFILE)
config-install:
- mkdir -p $(DESTDIR)/$(NG_CONFIG)
-@@ -156,15 +156,15 @@
- cp -r cfg/templates/extra $(DESTDIR)/$(NG_CONFIG_SUB)
- cp -r cfg/templates/standard $(DESTDIR)/$(NG_CONFIG_SUB)
+- mkdir -p $(NG_CONFIG)
+- mkdir -p $(NG_CONFIG_SUB)
+- mkdir -p $(NG_CONFIG_SUB)/templates/extra
+- mkdir -p $(NG_CONFIG_SUB)/templates/standard
++ mkdir -p $(DESTDIR)/$(NG_CONFIG)
++ mkdir -p $(DESTDIR)/$(NG_CONFIG_SUB)
++ mkdir -p $(DESTDIR)/$(NG_CONFIG_SUB)/templates/extra
++ mkdir -p $(DESTDIR)/$(NG_CONFIG_SUB)/templates/standard
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
-- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
-+ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
+- cp -r cfg/ng*.ncfg $(NG_CONFIG)
+- cp -r cfg/nmg*.ncfg $(NG_CONFIG_SUB)
+- cp -r cfg/templates/extra/*.ncfg_disabled $(NG_CONFIG_SUB)/templates/extra
+- cp -r cfg/templates/standard/*.ncfg_disabled $(NG_CONFIG_SUB)/templates/standard
++ cp -r cfg/ng*.ncfg $(DESTDIR)/$(NG_CONFIG)
++ cp -r cfg/nmg*.ncfg $(DESTDIR)/$(NG_CONFIG_SUB)
++ cp -r cfg/templates/extra/*.ncfg_disabled $(DESTDIR)/$(NG_CONFIG_SUB)/templates/extra
++ cp -r cfg/templates/standard/*.ncfg_disabled $(DESTDIR)/$(NG_CONFIG_SUB)/templates/standard
+- chown -R $(NAGIOS_PROC_USER) $(NG_CONFIG)/*.ncfg*
+- chgrp -R $(NAGIOS_PROC_GROUP) $(NG_CONFIG)/*.ncfg*
++ #chown -R $(NAGIOS_PROC_USER) $(NG_CONFIG)/*.ncfg*
++ #chgrp -R $(NAGIOS_PROC_GROUP) $(NG_CONFIG)/*.ncfg*
+
cgi-install:
- mkdir -p $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
- cp sbin/*.cgi $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
-- chgrp -R $(APACHE_GROUP) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
-+ #chgrp -R $(APACHE_GROUP) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
- chmod -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
+- mkdir -p $(NAGIOS_FOLDER_CGI)
+- cp sbin/*.cgi $(NAGIOS_FOLDER_CGI)
+- chown -R $(NAGIOS_PROC_USER) $(NAGIOS_FOLDER_CGI)
+- chgrp -R $(APACHE_GROUP) $(NAGIOS_FOLDER_CGI)
+- chmod -R 0755 $(NAGIOS_FOLDER_CGI)
++ mkdir -p $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
++ cp sbin/*.cgi $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
++ #chown -R $(NAGIOS_PROC_USER) $(NAGIOS_FOLDER_CGI)
++ #chgrp -R $(APACHE_GROUP) $(NAGIOS_FOLDER_CGI)
++ chmod -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
bin-install:
-@@ -175,8 +175,8 @@
- contrib/udpecho/udpecho.c \
- $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+- mkdir -p $(NAGIOS_CONTRIBUTION)
++ mkdir -p $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+ cp bin/collect2.pl \
+ bin/fifo_write.pl \
+ contrib/fifo_write/C/fifo_write \
+ contrib/udpecho/udpecho \
+- $(NAGIOS_CONTRIBUTION)
++ $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-+ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
- chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+- chown -R $(NAGIOS_PROC_USER) $(NAGIOS_CONTRIBUTION)
+- chgrp -R $(NAGIOS_PROC_GROUP) $(NAGIOS_CONTRIBUTION)
+- chmod -R 0755 $(NAGIOS_CONTRIBUTION)
++ #chown -R $(NAGIOS_PROC_USER) $(NAGIOS_CONTRIBUTION)
++ #chgrp -R $(NAGIOS_PROC_GROUP) $(NAGIOS_CONTRIBUTION)
++ chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
bin-compile:
-@@ -186,8 +186,8 @@
- gcc $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho.c -o \
- $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho
+ gcc contrib/fifo_write/C/fifo_write.c -o \
+@@ -214,29 +214,29 @@
+ gcc contrib/udpecho/udpecho.c -o \
+ contrib/udpecho/udpecho
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-+ #chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-+ #chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+- chown -R $(NAGIOS_PROC_USER) $(NAGIOS_CONTRIBUTION)
+- chgrp -R $(NAGIOS_PROC_GROUP) $(NAGIOS_CONTRIBUTION)
++ #chown -R $(NAGIOS_PROC_USER) $(NAGIOS_CONTRIBUTION)
++ #chgrp -R $(NAGIOS_PROC_GROUP) $(NAGIOS_CONTRIBUTION)
perl-install:
- mkdir -p $(DESTDIR)/$(PERL_INC)
-@@ -195,8 +195,8 @@
- cp -r lib/NagiosGrapher $(DESTDIR)/$(PERL_INC)
+- mkdir -p $(PERL_INC)/NagiosGrapher/Hooks
++ mkdir -p $(DESTDIR)/$(PERL_INC)/NagiosGrapher/Hooks
+- cp lib/NagiosGrapher.pm $(PERL_INC)
+- cp lib/NagiosGrapher/*.pm $(PERL_INC)/NagiosGrapher
+- cp lib/NagiosGrapher/Hooks/*.pm $(PERL_INC)/NagiosGrapher/Hooks
++ cp lib/NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
++ cp lib/NagiosGrapher/*.pm $(DESTDIR)/$(PERL_INC)/NagiosGrapher
++ cp lib/NagiosGrapher/Hooks/*.pm $(DESTDIR)/$(PERL_INC)/NagiosGrapher/Hooks
+
+- chown -R $(NAGIOS_PROC_USER) $(PERL_INC)
+- chgrp -R $(NAGIOS_PROC_GROUP) $(PERL_INC)
++ #chown -R $(NAGIOS_PROC_USER) $(PERL_INC)
++ #chgrp -R $(NAGIOS_PROC_GROUP) $(PERL_INC)
+
init-script:
-- cp nagios_grapher $(DESTDIR)/etc/init.d
-- chmod 0755 $(DESTDIR)/etc/init.d/nagios_grapher
-+ #cp nagios_grapher $(DESTDIR)/etc/init.d
-+ #chmod 0755 $(DESTDIR)/etc/init.d/nagios_grapher
+- cp nagios_grapher $(NG_INIT_SCRIPT_DIR)
+- chmod 0755 $(NG_INIT_SCRIPT_DIR)/nagios_grapher
++ #cp nagios_grapher $(NG_INIT_SCRIPT_DIR)
++ #chmod 0755 $(NG_INIT_SCRIPT_DIR)/nagios_grapher
image-install:
- mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES)
-diff -urNad nagiosgrapher-1.6.1rc3~/cfg/ngraph.ncfg.in nagiosgrapher-1.6.1rc3/cfg/ngraph.ncfg.in
---- nagiosgrapher-1.6.1rc3~/cfg/ngraph.ncfg.in 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/cfg/ngraph.ncfg.in 2007-07-23 21:42:47.000000000 +0200
-@@ -11,7 +11,7 @@
- interface @NG_INTERFACE@
+- mkdir -p $(NAGIOS_IMAGES)
+- mkdir -p $(NAGIOS_IMAGES_LOGOS)
++ mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES)
++ mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES_LOGOS)
- # please use subfolder
-- pidfile @NG_DAEMON@/nagios_grapher.pid
-+ pidfile @NG_DAEMON@/nagiosgrapher.pid
- user @NAGIOS_PROC_USER@
- group @NAGIOS_PROC_GROUP@
+- cp *.png $(NAGIOS_IMAGES)
+- cp *.png $(NAGIOS_IMAGES_LOGOS)
++ cp *.png $(DESTDIR)/$(NAGIOS_IMAGES)
++ cp *.png $(DESTDIR)/$(NAGIOS_IMAGES_LOGOS)
-@@ -24,21 +24,21 @@
- rrdpath @NG_RRD@/
- tmppath /tmp/nagiosgrapher/
+ fixdeps-force:
+ $(PERL) ./tools/testdeps.pl fix;;
+diff -urNad nagiosgrapher-1.6.1rc5~/cfg/ngraph.ncfg.in nagiosgrapher-1.6.1rc5/cfg/ngraph.ncfg.in
+--- nagiosgrapher-1.6.1rc5~/cfg/ngraph.ncfg.in 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/ngraph.ncfg.in 2007-08-18 14:10:54.000000000 +0200
+@@ -12,7 +12,7 @@
+ interface @NG_INTERFACE@
-- fontfile /usr/local/rrdtool/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
-+ fontfile /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+ # please use subfolder
+- pidfile @NG_DAEMON@/nagios_grapher.pid
++ pidfile @NG_DAEMON@/nagiosgrapher.pid
+ user @NAGIOS_PROC_USER@
+ group @NAGIOS_PROC_GROUP@
- serviceext_type @NG_SRVEXT@
- serviceextinfo @NG_SRVEXT_FILE@
- serviceext_path @NG_SRVEXT_DIR@
+@@ -31,7 +31,7 @@
+ serviceextinfo @NG_SRVEXT_FILE@
+ serviceext_path @NG_SRVEXT_DIR@
-- url /nagios/cgi-bin/graphs.cgi
-+ url /cgi-bin/nagios2/graphs.cgi
- notes_url /wiki/index.php/$HOSTNAME$#$SERVICEDESC$
+- url /nagios/cgi-bin/graphs.cgi
++ url /cgi-bin/nagios2/graphs.cgi
+ #notes_url /wiki/index.php/$HOSTNAME$#$SERVICEDESC$
+ notes_url
- nagios_config @NAGIOS_CONFIG@
- cgi_config @NAGIOS_CONFIG_CGI@
+@@ -39,7 +39,7 @@
+ cgi_config @NAGIOS_CONFIG_CGI@
- icon_image_tag ' dot.png' border="0"></a><A TARGET="_blank" HREF="graphs.cgi?###URL###"><img src='###IMAGESRC###' '
-- icon_image_src /nagios/images/logos/graph.png
-- icon_image_script /nagios/cgi-bin/rrd2-system.cgi?###URL###&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
-+ icon_image_src /nagios2/images/logos/graph.png
-+ icon_image_script /cgi-bin/nagios2/rrd2-system.cgi?###URL###&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
- icon_image_static no
+ icon_image_tag ' dot.png' border="0"></a><A TARGET="_blank" HREF="graphs.cgi?###URL###"><img src='###IMAGESRC###' '
+- icon_image_src @NG_LOGOS@/graph.png
++ icon_image_src /nagios2/images/graph.png
+ icon_image_script @NG_CGI@/rrd2-system.cgi?###URL###&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
+ icon_image_static true
- log_file @NG_LOGFILE@
-diff -urNad nagiosgrapher-1.6.1rc3~/config.layout nagiosgrapher-1.6.1rc3/config.layout
---- nagiosgrapher-1.6.1rc3~/config.layout 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/config.layout 2007-07-23 21:42:47.000000000 +0200
-@@ -22,22 +22,22 @@
-
- # layout for debian package install
- <Layout debian>
-- prefix: /usr/local/nagios
-- nagios_config: /etc/nagios/nagios.cfg
-- nagios_config_cgi: /etc/nagios/cgi.cfg
-- nagios_images: /usr/share/nagios/htdocs/images
-- nagios_images_logos: /usr/share/nagios/htdocs/images/logos
-- nagios_folder_cgi: /usr/lib/cgi-bin/nagios
-- perl_inc: /etc/perl
-- nagios_contribution: /usr/share/nagios/contrib
-- ng_config: /etc/nagios
-+ prefix: /usr/share/nagiosgrapher
-+ nagios_config: /etc/nagios2/nagios.cfg
-+ nagios_config_cgi: /etc/nagios2/cgi.cfg
-+ nagios_images: /usr/share/nagiosgrapher/htdocs/images
-+ nagios_images_logos: /usr/share/nagiosgrapher/htdocs/images/logos
-+ nagios_folder_cgi: /usr/lib/cgi-bin/nagiosgrapher
-+ perl_inc: /usr/share/perl5
-+ nagios_contribution: /usr/lib/nagiosgrapher
-+ ng_config: /etc/nagiosgrapher
- ng_config_sub: ${ng_config}/ngraph.d
-- ng_daemon: /var/run/nagios_grapher
-- ng_srvext_file: /etc/nagios/serviceextinfo.cfg
-- ng_srvext_dir: /etc/nagios/serviceext
-- ng_interface_pipe: /var/lib/nagios/ngraph.pipe
-- ng_logfile: /var/log/nagios/ngraph.log
-- ng_rrd: /var/lib/nagios/rrd
-+ ng_daemon: /var/run/nagiosgrapher
-+ ng_srvext_file: /etc/nagios2/serviceextinfo.cfg
-+ ng_srvext_dir: /etc/nagios2/serviceext
-+ ng_interface_pipe: /var/lib/nagiosgrapher/ngraph.pipe
-+ ng_logfile: /var/log/nagiosgrapher/ngraph.log
-+ ng_rrd: /var/lib/nagiosgrapher/rrd
- </Layout>
-
- # PLD layout
-diff -urNad nagiosgrapher-1.6.1rc3~/configure.ac nagiosgrapher-1.6.1rc3/configure.ac
---- nagiosgrapher-1.6.1rc3~/configure.ac 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/configure.ac 2007-07-23 21:42:47.000000000 +0200
+diff -urNad nagiosgrapher-1.6.1rc5~/configure.ac nagiosgrapher-1.6.1rc5/configure.ac
+--- nagiosgrapher-1.6.1rc5~/configure.ac 2007-08-15 12:23:17.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/configure.ac 2007-08-18 14:10:31.000000000 +0200
@@ -18,7 +18,7 @@
AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl])
fi
@@ -175,7 +177,7 @@
AC_DEFUN([NG_ENABLE_LAYOUT], [
-@@ -248,9 +248,9 @@
+@@ -353,9 +353,9 @@
dnl NG_INTERFACE
AC_ARG_WITH(ng-interface,
@@ -187,7 +189,7 @@
)
AC_SUBST(NG_INTERFACE)
-@@ -290,7 +290,7 @@
+@@ -395,7 +395,7 @@
AC_ARG_WITH(ng-loglevel,
AC_HELP_STRING([--with-ng-loglevel=INT], [the loglevel]),
NG_LOGLEVEL=$withval,
@@ -196,18 +198,9 @@
)
AC_SUBST(NG_LOGLEVEL)
-@@ -323,7 +323,7 @@
- AC_SUBST([NG_DAEMON], ${exp_ng_daemon})
- AC_SUBST([NG_SRVEXT_FILE], ${exp_ng_srvext_file})
- AC_SUBST([NG_SRVEXT_DIR], ${exp_ng_srvext_dir})
--AC_SUBST([NG_INTERFACE_PIPE], ${exp_interface_pipe})
-+AC_SUBST([NG_INTERFACE_PIPE], ${exp_ng_interface_pipe})
- AC_SUBST([NG_LOGFILE], ${exp_ng_logfile})
- AC_SUBST([NG_RRD], ${exp_ng_rrd})
-
-diff -urNad nagiosgrapher-1.6.1rc3~/lib/NagiosGrapher.pm.in nagiosgrapher-1.6.1rc3/lib/NagiosGrapher.pm.in
---- nagiosgrapher-1.6.1rc3~/lib/NagiosGrapher.pm.in 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/lib/NagiosGrapher.pm.in 2007-07-23 21:42:47.000000000 +0200
+diff -urNad nagiosgrapher-1.6.1rc5~/lib/NagiosGrapher.pm.in nagiosgrapher-1.6.1rc5/lib/NagiosGrapher.pm.in
+--- nagiosgrapher-1.6.1rc5~/lib/NagiosGrapher.pm.in 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/lib/NagiosGrapher.pm.in 2007-08-18 14:10:31.000000000 +0200
@@ -49,7 +49,7 @@
our $ngraphcfg = '@NG_CONFIG@/ngraph.ncfg';
our $xmlfile = 'index.xml';
Modified: nagiosgrapher/trunk/debian/patches/nmgraph.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/nmgraph.dpatch 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/patches/nmgraph.dpatch 2007-08-18 12:17:55 UTC (rev 1208)
@@ -5,13 +5,23 @@
## DP: No description.
@DPATCH@
-diff -urNad nagiosgrapher-1.6.1~/cfg/nmgraph.ncfg nagiosgrapher-1.6.1/cfg/nmgraph.ncfg
---- nagiosgrapher-1.6.1~/cfg/nmgraph.ncfg 1970-01-01 01:00:00.000000000 +0100
-+++ nagiosgrapher-1.6.1/cfg/nmgraph.ncfg 2007-03-07 15:03:44.000000000 +0100
-@@ -0,0 +1,56 @@
-+# Multi Graphs #########################################
-+
-+define nmgraph{
+diff -urNad nagiosgrapher-1.6.1rc5~/cfg/nmgraph.ncfg-sample nagiosgrapher-1.6.1rc5/cfg/nmgraph.ncfg-sample
+--- nagiosgrapher-1.6.1rc5~/cfg/nmgraph.ncfg-sample 2007-08-10 17:05:32.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/nmgraph.ncfg-sample 2007-08-18 00:59:04.000000000 +0200
+@@ -1,64 +1,56 @@
+ # Multi Graphs #########################################
+
+ define nmgraph{
+-
+- host_name * Multigraphen
+- service_name nethq-dev Services
+- # RegEX
+- hosts nethq-dev
+- # RegEX
+- services .*?
+- # line or stack or area
+- graph_type line
+-
+ host_name * Multigraphen
+ service_name nethq-dev Services
+ # RegEX
@@ -20,10 +30,23 @@
+ services .*?
+ # line or stack or area
+ graph_type line
-+}
-+
-+
-+define nmgraph{
+ }
+
+
+ define nmgraph{
+-
+- host_name * Multigraphen
+- service_name all ping
+- # RegEX
+- hosts .*?
+- # RegEX
+- services PING
+- # line or stack or area
+- graph_type stack
+- # normal or reverse or leave blank
+- order reverse
+- colors ff8000, 00ff00, 0000ff
+-
+ host_name * Multigraphen
+ service_name all ping
+ # RegEX
@@ -35,9 +58,22 @@
+ # normal or reverse or leave blank
+ order reverse
+ colors ff8000, 00ff00, 0000ff
-+}
-+
-+define nmgraph{
+ }
+
+ define nmgraph{
+-
+- host_name * Multigraphen
+- service_name all http
+- # RegEX
+- hosts .*?
+- # RegEX
+- services HTTP.*?
+- # line or stack or area
+- graph_type stack
+- # normal or reverse or leave blank
+- order reverse
+- colors ff8000, 00ff00, 0000ff
+-
+ host_name * Multigraphen
+ service_name all http
+ # RegEX
@@ -49,9 +85,22 @@
+ # normal or reverse or leave blank
+ order reverse
+ colors ff8000, 00ff00, 0000ff
-+}
-+
-+define nmgraph{
+ }
+
+ define nmgraph{
+-
+- host_name * Multigraphen
+- service_name all services
+- # RegEX
+- hosts .*?
+- # RegEX
+- services .*?
+- # line or stack or area
+- graph_type area
+- # normal or reverse or leave blank
+- # order normal
+- # colors ff8000, 00ff00, 0000ff
+-
+ host_name * Multigraphen
+ service_name all services
+ # RegEX
@@ -63,65 +112,5 @@
+ # normal or reverse or leave blank
+ # order normal
+ # colors ff8000, 00ff00, 0000ff
-+}
-+
-diff -urNad nagiosgrapher-1.6.1~/cfg/nmgraph.ncfg-sample nagiosgrapher-1.6.1/cfg/nmgraph.ncfg-sample
---- nagiosgrapher-1.6.1~/cfg/nmgraph.ncfg-sample 2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1/cfg/nmgraph.ncfg-sample 1970-01-01 01:00:00.000000000 +0100
-@@ -1,56 +0,0 @@
--# Multi Graphs #########################################
--
--define nmgraph{
-- host_name * Multigraphen
-- service_name nethq-dev Services
-- # RegEX
-- hosts nethq-dev
-- # RegEX
-- services .*?
-- # line or stack or area
-- graph_type line
--}
--
--
--define nmgraph{
-- host_name * Multigraphen
-- service_name all ping
-- # RegEX
-- hosts .*?
-- # RegEX
-- services PING
-- # line or stack or area
-- graph_type stack
-- # normal or reverse or leave blank
-- order reverse
-- colors ff8000, 00ff00, 0000ff
--}
--
--define nmgraph{
-- host_name * Multigraphen
-- service_name all http
-- # RegEX
-- hosts .*?
-- # RegEX
-- services HTTP.*?
-- # line or stack or area
-- graph_type stack
-- # normal or reverse or leave blank
-- order reverse
-- colors ff8000, 00ff00, 0000ff
--}
--
--define nmgraph{
-- host_name * Multigraphen
-- service_name all services
-- # RegEX
-- hosts .*?
-- # RegEX
-- services .*?
-- # line or stack or area
-- graph_type area
-- # normal or reverse or leave blank
-- # order normal
-- # colors ff8000, 00ff00, 0000ff
--}
--
+ }
+
Modified: nagiosgrapher/trunk/debian/postinst.in
===================================================================
--- nagiosgrapher/trunk/debian/postinst.in 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/postinst.in 2007-08-18 12:17:55 UTC (rev 1208)
@@ -30,6 +30,7 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
CFGS="@@CFGS@@"
+TMPL_CFGS="@@TMPL_CFGS@@"
case "$1" in
configure)
@@ -38,6 +39,11 @@
/etc/nagiosgrapher/$cfg
done
+ for tmpl in $TMPL_CFGS; do
+ ucf /usr/share/nagiosgrapher/debian/cfg/ngraph.d/$tmpl \
+ /etc/nagiosgrapher/ngraph.d/$tmpl
+ done
+
for dir in /var/lib/nagiosgrapher /var/lib/nagiosgrapher/rrd \
/var/cache/nagiosgrapher \
/var/log/nagiosgrapher \
Modified: nagiosgrapher/trunk/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules 2007-08-12 03:10:21 UTC (rev 1207)
+++ nagiosgrapher/trunk/debian/rules 2007-08-18 12:17:55 UTC (rev 1208)
@@ -2,9 +2,11 @@
# -*- makefile -*-
#CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
-CFGS:=ngraph.ncfg ngraph.d/nmgraph.ncfg ngraph.d/extra/check_weather.ncfg ngraph.d/standard/check_procs.ncfg ngraph.d/standard/check_ping.ncfg ngraph.d/standard/check_pop.ncfg ngraph.d/standard/check_http.ncfg ngraph.d/standard/check_load.ncfg ngraph.d/standard/check_users.ncfg
+CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg
+TMPL_DIR := extra/ standard/
-PKG=nagiosgrapher
+PKG:=nagiosgrapher
+PKG_TMP:=debian/$(PKG)
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
@@ -12,19 +14,36 @@
#DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
#DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian
+DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch
DEB_AUTO_UPDATE_AUTOCONF := 1
install/$(PKG)::
rm -f debian/$(PKG)/usr/lib/$(PKG)/*.c
- for dir in standard extra; do \
- mkdir -p debian/$(PKG)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \
+ mkdir -p $(PKG_TMP)/etc/nagios2/serviceext
+
+ for dir in $(TMPL_DIR); do \
+ mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \
done
+
+ # install config templates
for cfg in $(CFGS); do \
- mv debian/$(PKG)/etc/$(PKG)/$$cfg \
- debian/$(PKG)/usr/share/$(PKG)/debian/cfg/$$cfg; \
+ mv $(PKG_TMP)/etc/$(PKG)/$$cfg* \
+ $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/$$cfg; \
done
- sed "s#@@CFGS@@#$(CFGS)#g" < debian/postinst.in > debian/postinst
- find debian/$(PKG)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \
+
+ # install service perf. templates
+ tmpl_root=$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates; \
+ for tmpl_dir in $(TMPL_DIR); do \
+ for tmpl in $$tmpl_root/$$tmpl_dir/*.ncfg_disabled; do \
+ dest=`echo $$tmpl | sed "s#.*\($$tmpl_dir/.*\.ncfg\).*#\1#"`; \
+ mv $${tmpl} $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dest; \
+ tmpl_cfgs="$$tmpl_cfgs $$dest"; \
+ done; \
+ mv $$tmpl_root/$$tmpl_dir $(PKG_TMP)/etc/$(PKG)/ngraph.d/; \
+ done; \
+ sed "s#@@CFGS@@#$(CFGS)#g;s#@@TMPL_CFGS@@#$$tmpl_cfgs#g" < debian/postinst.in > debian/postinst
+
+ # fix permissions
+ find $(PKG_TMP)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \
| xargs -0 chmod 0644
More information about the Pkg-nagios-changes
mailing list