[Pkg-nagios-changes] [pkg-nagios] r1432 - in nagiosgrapher/trunk/debian: . exmpl patches

Hendrik Frenzel hfrenzel-guest at alioth.debian.org
Wed Apr 30 00:27:33 UTC 2008


tags 466854 pending
thanks

Author: hfrenzel-guest
Date: 2008-04-30 00:27:33 +0000 (Wed, 30 Apr 2008)
New Revision: 1432

Added:
   nagiosgrapher/trunk/debian/NEWS
   nagiosgrapher/trunk/debian/TODO
   nagiosgrapher/trunk/debian/commands.cfg
   nagiosgrapher/trunk/debian/patches/466854.dpatch
   nagiosgrapher/trunk/debian/patches/config.layout.dpatch
   nagiosgrapher/trunk/debian/postrm.in
Modified:
   nagiosgrapher/trunk/debian/README.Debian
   nagiosgrapher/trunk/debian/changelog
   nagiosgrapher/trunk/debian/control
   nagiosgrapher/trunk/debian/dirs
   nagiosgrapher/trunk/debian/exmpl/process-service-perfdata.cfg
   nagiosgrapher/trunk/debian/links
   nagiosgrapher/trunk/debian/patches/00list
   nagiosgrapher/trunk/debian/patches/debian.dpatch
   nagiosgrapher/trunk/debian/patches/makefiles.dpatch
   nagiosgrapher/trunk/debian/postinst.in
   nagiosgrapher/trunk/debian/rules
   nagiosgrapher/trunk/debian/watch
Log:
various changes as switch to nagios3 (see debian/changelog)


Added: nagiosgrapher/trunk/debian/NEWS
===================================================================
--- nagiosgrapher/trunk/debian/NEWS	                        (rev 0)
+++ nagiosgrapher/trunk/debian/NEWS	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,8 @@
+nagiosgrapher (1.6.1rc5-6) unstable; urgency=low
+
+   With this release of the debian packages, the placeholder tags where changed
+   from ###TAG### to ___TAG___ to better distinguish between #comments and those
+   tags. Please check your /etc/nagiosgrapher/ngraph.ncfg to fit those new tags
+   or new created serviceextinfo won't work correctly.
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 30 Apr 2008 01:37:03 +0200

Modified: nagiosgrapher/trunk/debian/README.Debian
===================================================================
--- nagiosgrapher/trunk/debian/README.Debian	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/README.Debian	2008-04-30 00:27:33 UTC (rev 1432)
@@ -9,43 +9,18 @@
  Just a few steps to run the grapher ...
 
  =============================================================
- Serviceexttype, MULTIPLE:
-	Add these line to your nagios.cfg.
-	cfg_dir=/etc/nagios2/serviceext
-	
- Serviceexttype, SINGLE:
-	Add these line to your cgi.cfg.
-	xedtemplate_config_file=/etc/nagios2/serviceextinfo.cfg
-	
- =============================================================
+ 
  To tell nagios to write service perfdata add these lines to your nagios.cfg:
 
 	process_performance_data=1
-	service_perfdata_command=process-service-perfdata
+	service_perfdata_command=ngraph-process-service-perfdata-pipe
 	
  =============================================================
- And add one of the following commands to your misccommands.cfg
- (Based on the interface you are using: updecho for network, fifo_write for pipe)
-
- define command{
-	command_name process-service-perfdata
-	command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667
- }
-
- define command{
-	command_name process-service-perfdata
-	command_line /usr/lib/nagiosgrapher/fifo_write /var/lib/nagiosgrapher/ngraph.pipe '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3
- }
-
- Note if you are using other tools like netcat or printf to passthrough this string:
-	'$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n'
-
- =============================================================
+ 
  Please do not forget to set a proper loglevel!
- Default loglevel is set to 511 which means all. That is why the logfile can grow very fast!
 
 There is an example in /usr/share/doc/nagiosgrapher/examples with some more ways
-to define process-service-perfdata.
+to define service_perfdata_commands
 
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 16 Jul 2007 11:27:27 +0200
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 30 Apr 2008 02:01:06 +0200
 

Added: nagiosgrapher/trunk/debian/TODO
===================================================================
--- nagiosgrapher/trunk/debian/TODO	                        (rev 0)
+++ nagiosgrapher/trunk/debian/TODO	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,5 @@
+nagiosgrapher TODO
+------------------
+
+* split upstream related patches from debian specific 
+

Modified: nagiosgrapher/trunk/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/changelog	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,3 +1,20 @@
+nagiosgrapher (1.6.1rc5-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * patched ignorance of comments into NagiosGrapher.pm (Closes: 466854)
+    + changed tags in ngraph.ncfg 
+      (see /usr/share/doc/nagiosgrapher/NEWS.Debian.gz)
+  * switched to nagios3 support
+    + moved nagiosgraphers config for nagios3 to /etc/nagiosgrapher/nagios3
+      and symlinked to /etc/nagios3/conf.d/ngraph for inclusion
+  * debian/watch
+    + changed upstreams download URL
+    + removed unused comments
+  * debian/postrm.in
+    + purge ucf handled configs on package purge
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 30 Apr 2008 02:22:00 +0200
+
 nagiosgrapher (1.6.1rc5-5) unstable; urgency=low
 
   * patched clean and distclean targets to Makefile.in

Added: nagiosgrapher/trunk/debian/commands.cfg
===================================================================
--- nagiosgrapher/trunk/debian/commands.cfg	                        (rev 0)
+++ nagiosgrapher/trunk/debian/commands.cfg	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,10 @@
+define command{
+	command_name ngraph-process-service-perfdata-pipe
+	command_line /usr/lib/nagiosgrapher/fifo_write /var/lib/nagiosgrapher/ngraph.pipe '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3
+}
+
+define command{
+	command_name ngraph-process-service-perfdata-udp
+	command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667
+}
+

Modified: nagiosgrapher/trunk/debian/control
===================================================================
--- nagiosgrapher/trunk/debian/control	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/control	2008-04-30 00:27:33 UTC (rev 1432)
@@ -12,7 +12,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, nagios-images
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, ttf-dejavu, rrdtool, librrds-perl, libgd-gd2-perl, libimage-magick-perl, libcalendar-simple-perl, liburi-perl, nagios3, 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/dirs
===================================================================
--- nagiosgrapher/trunk/debian/dirs	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/dirs	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,5 +1,5 @@
 usr/sbin
-usr/share/nagios2/htdocs/images/logos
+usr/share/nagios3/htdocs/images/logos
 var/cache/nagiosgrapher
-usr/lib/cgi-bin/nagios2
-etc/nagios2/serviceext
+usr/lib/cgi-bin/nagios3
+etc/nagiosgrapher/nagios3/serviceext

Modified: nagiosgrapher/trunk/debian/exmpl/process-service-perfdata.cfg
===================================================================
--- nagiosgrapher/trunk/debian/exmpl/process-service-perfdata.cfg	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/exmpl/process-service-perfdata.cfg	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,23 +1,23 @@
-# And add one of the following commands to your misccommands.cfg
-# (Based on the interface you are using: updecho for network, fifo_write for pipe)
+# Add one of the following commands, based on the interface you are using,
+# to your /etc/nagiosgrapher/nagios3/commands.cfg
 
 define command {
-	command_name   process-service-perfdata
+	command_name   ngraph-process-service-perfdata-pipe
 	command_line    /usr/lib/nagiosgrapher/fifo_write.pl /var/lib/nagiosgrapher/ngraph.pipe '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3
 }
 
-#define command{
-#	command_name    process-service-perfdata
-#	command_line    echo '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' | nc -u -w 3 localhost 5667
-#}
+define command{
+	command_name    ngraph-process-service-perfdata-nc
+	command_line    echo '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' | nc -u -w 3 localhost 5667
+}
 
-#define command{
-#	command_name process-service-perfdata 
-#	command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667
-#}
+define command{
+	command_name ngraph-process-service-perfdata-udp
+	command_line /usr/lib/nagiosgrapher/udpecho 127.0.0.1 '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 5667
+}
 
-#define command{
-#	command_name process-service-perfdata
-#	command_line /usr/lib/nagiosgrapher/fifo_write  '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3
-#}
+define command{
+	command_name ngraph-process-service-perfdata-pipe
+	command_line /usr/lib/nagiosgrapher/fifo_write  '$HOSTNAME$\t$SERVICEDESC$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n' 3
+}
 

Modified: nagiosgrapher/trunk/debian/links
===================================================================
--- nagiosgrapher/trunk/debian/links	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/links	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,8 +1,9 @@
-usr/lib/cgi-bin/nagiosgrapher/graphs.cgi      usr/lib/cgi-bin/nagios2/graphs.cgi
-usr/lib/cgi-bin/nagiosgrapher/rrd2-graph.cgi  usr/lib/cgi-bin/nagios2/rrd2-graph.cgi
-usr/lib/cgi-bin/nagiosgrapher/rrd2-system.cgi usr/lib/cgi-bin/nagios2/rrd2-system.cgi
-usr/share/nagiosgrapher/htdocs/images/dot.png         usr/share/nagios2/htdocs/images/dot.png
-usr/share/nagiosgrapher/htdocs/images/graph.png       usr/share/nagios2/htdocs/images/graph.png
-usr/share/nagiosgrapher/htdocs/images/logos/dot.png   usr/share/nagios2/htdocs/images/logos/dot.png
-usr/share/nagiosgrapher/htdocs/images/logos/graph.png usr/share/nagios2/htdocs/images/logos/graph.png
+usr/lib/cgi-bin/nagiosgrapher/graphs.cgi      usr/lib/cgi-bin/nagios3/graphs.cgi
+usr/lib/cgi-bin/nagiosgrapher/rrd2-graph.cgi  usr/lib/cgi-bin/nagios3/rrd2-graph.cgi
+usr/lib/cgi-bin/nagiosgrapher/rrd2-system.cgi usr/lib/cgi-bin/nagios3/rrd2-system.cgi
+usr/share/nagiosgrapher/htdocs/images/dot.png         usr/share/nagios3/htdocs/images/dot.png
+usr/share/nagiosgrapher/htdocs/images/graph.png       usr/share/nagios3/htdocs/images/graph.png
+usr/share/nagiosgrapher/htdocs/images/logos/dot.png   usr/share/nagios3/htdocs/images/logos/dot.png
+usr/share/nagiosgrapher/htdocs/images/logos/graph.png usr/share/nagios3/htdocs/images/logos/graph.png
 usr/lib/nagiosgrapher/collect2.pl usr/sbin/nagiosgrapher
+etc/nagiosgrapher/nagios3 etc/nagios3/conf.d/ngraph

Modified: nagiosgrapher/trunk/debian/patches/00list
===================================================================
--- nagiosgrapher/trunk/debian/patches/00list	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/patches/00list	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,4 +1,7 @@
 debian
+config.layout
 nmgraph
 checks
 makefiles
+466854
+

Added: nagiosgrapher/trunk/debian/patches/466854.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/466854.dpatch	                        (rev 0)
+++ nagiosgrapher/trunk/debian/patches/466854.dpatch	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 466854.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~/bin/collect2.pl.in nagiosgrapher-1.6.1rc5/bin/collect2.pl.in
+--- nagiosgrapher-1.6.1rc5~/bin/collect2.pl.in	2008-04-30 02:01:39.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/bin/collect2.pl.in	2008-04-30 02:18:40.000000000 +0200
+@@ -613,18 +613,18 @@
+ 	                $graph_url     = "host=$host&service=$service";
+ 
+ 	                # Replace wrappers misc
+-	                $new_image_tag =~ s/###HOST###/$host/gi;
+-	                $new_image_tag =~ s/###SERVICE###/$service/gi;
+-	                $new_image_tag =~ s/###URL###/$graph_url/gi;
++	                $new_image_tag =~ s/___HOST___/$host/gi;
++	                $new_image_tag =~ s/___SERVICE___/$service/gi;
++	                $new_image_tag =~ s/___URL___/$graph_url/gi;
+ 
+ 					# Replace wrappers, src specific
+ 					if ($image_static) {
+-						$new_image_tag =~ s/###IMAGESRC###/$image_src/gi;
++						$new_image_tag =~ s/___IMAGESRC___/$image_src/gi;
+ 		            }
+ 		            elsif (!$image_static && $image_script) {
+ 		            	$new_image_script = $image_script;
+-		            	$new_image_script =~ s/###URL###/$graph_url/gi;
+-		            	$new_image_tag =~ s/###IMAGESRC###/$new_image_script/gi;
++		            	$new_image_script =~ s/___URL___/$graph_url/gi;
++		            	$new_image_tag =~ s/___IMAGESRC___/$new_image_script/gi;
+ 		            }
+ 
+ 					my %args = (
+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	2008-04-30 02:17:47.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/ngraph.ncfg.in	2008-04-30 02:18:19.000000000 +0200
+@@ -38,9 +38,9 @@
+     nagios_config           @NAGIOS_CONFIG@
+     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_tag          'dot.png' border="0"></a><A TARGET="_blank" HREF='graphs.cgi?___URL___'><img src='___IMAGESRC___' '
+     icon_image_src          /nagios3/images/graph.png
+-    icon_image_script       /cgi-bin/nagios3/rrd2-system.cgi?###URL###&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
++    icon_image_script       /cgi-bin/nagios3/rrd2-system.cgi?___URL___&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
+     icon_image_static       false
+ 
+     log_file                @NG_LOGFILE@
+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	2008-04-30 02:17:47.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/lib/NagiosGrapher.pm.in	2008-04-30 02:17:47.000000000 +0200
+@@ -571,6 +571,7 @@
+ 		while (<CFG>) {
+ 			if ( m/\s*define\s+config\s*{/ .. /\s*}/ ) {
+ 				s/^\s*//;
++				s/#.*$//;
+ 				chomp();
+ 				if (m/\s*define\s+config\s*{/) {
+ 					# do nothing;


Property changes on: nagiosgrapher/trunk/debian/patches/466854.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: nagiosgrapher/trunk/debian/patches/config.layout.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/config.layout.dpatch	                        (rev 0)
+++ nagiosgrapher/trunk/debian/patches/config.layout.dpatch	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## config.layout.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~/config.layout nagiosgrapher-1.6.1rc5/config.layout
+--- nagiosgrapher-1.6.1rc5~/config.layout	2007-08-15 12:23:17.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/config.layout	2008-04-29 01:16:27.000000000 +0200
+@@ -51,8 +51,8 @@
+ # layout for debian package install as provided by the debian patches of Hendrik Frenzel
+ <Layout debian-patch>
+ 	prefix:				/usr/share/nagiosgrapher
+-	nagios_config:			/etc/nagios2/nagios
+-	nagios_config_cgi:		/etc/nagios2/cgi.cfg
++	nagios_config:			/etc/nagios3/nagios.cfg
++	nagios_config_cgi:		/etc/nagios3/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
+@@ -61,8 +61,8 @@
+ 	ng_config:			/etc/nagiosgrapher
+ 	ng_config_sub:			${ng_config}/ngraph.d
+ 	ng_daemon:			/var/run/nagiosgrapher
+-	ng_srvext_file:			/etc/nagios2/serviceextinfo.cfg
+-	ng_srvext_dir:			/etc/nagios2/serviceext
++	ng_srvext_file:			/etc/nagiosgrapher/nagios3/serviceextinfo.cfg
++	ng_srvext_dir:			/etc/nagiosgrapher/nagios3/serviceext
+ 	ng_interface_pipe:		/var/lib/nagiosgrapher/ngraph.pipe
+ 	ng_logfile:			/var/log/nagiosgrapher/ngraph.log
+ 	ng_rrd:				/var/lib/nagiosgrapher/rrd


Property changes on: nagiosgrapher/trunk/debian/patches/config.layout.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagiosgrapher/trunk/debian/patches/debian.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/debian.dpatch	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/patches/debian.dpatch	2008-04-30 00:27:33 UTC (rev 1432)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 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
+--- nagiosgrapher-1.6.1rc5~/Makefile.in	2008-04-30 02:01:39.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/Makefile.in	2008-04-30 02:14:52.000000000 +0200
 @@ -160,52 +160,52 @@
  	@exit 1
  
@@ -20,7 +20,7 @@
 -	mkdir -p `dirname $(NG_LOGFILE)` 
 -	mkdir -p $(NG_DAEMON)
 -	mkdir -p $(NG_RRD)
-+	mkdir -p i$(DESTDIR)/$(NG_SRVEXT_DIR)
++	mkdir -p $(DESTDIR)/$(NG_SRVEXT_DIR)
 +	#chown -R $(NAGIOS_PROC_USER) $(NG_SRVEXT_DIR)
 +	mkdir -p $(DESTDIR)/$(NG_RRD)
 +	#chown -R $(NAGIOS_PROC_USER) $(NG_RRD)
@@ -136,9 +136,9 @@
  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 @@
+--- nagiosgrapher-1.6.1rc5~/cfg/ngraph.ncfg.in	2008-04-30 02:01:39.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/cfg/ngraph.ncfg.in	2008-04-30 02:15:21.000000000 +0200
+@@ -12,12 +12,12 @@
      interface               @NG_INTERFACE@
  
      # please use subfolder
@@ -147,27 +147,39 @@
      user                    @NAGIOS_PROC_USER@
      group                   @NAGIOS_PROC_GROUP@
  
-@@ -31,7 +31,7 @@
+     # normal_check_interval
+-    #step                   300
++    step                   300
+ 
+     # VALUE (e.g. 600 for 5 minutes ) or AUTO
+     heartbeat               AUTO
+@@ -31,17 +31,17 @@
      serviceextinfo          @NG_SRVEXT_FILE@
      serviceext_path         @NG_SRVEXT_DIR@
  
 -    url                     /nagios/cgi-bin/graphs.cgi
-+    url                     /cgi-bin/nagios2/graphs.cgi
++    url                     /cgi-bin/nagios3/graphs.cgi
      #notes_url              /wiki/index.php/$HOSTNAME$#$SERVICEDESC$
-     notes_url
+-    notes_url
++    notes_url               ""
  
-@@ -39,7 +39,7 @@
+     nagios_config           @NAGIOS_CONFIG@
      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_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
+-    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
++    icon_image_tag          'dot.png' border="0"></a><A TARGET="_blank" HREF='graphs.cgi?###URL###'><img src='###IMAGESRC###' '
++    icon_image_src          /nagios3/images/graph.png
++    icon_image_script       /cgi-bin/nagios3/rrd2-system.cgi?###URL###&start=-5400&title=Actual&width=20&height=20&type=AVERAGE&only-graph=true
++    icon_image_static       false
  
+     log_file                @NG_LOGFILE@
+     log_level               @NG_LOGLEVEL@
 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
+--- nagiosgrapher-1.6.1rc5~/configure.ac	2008-04-30 02:01:39.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/configure.ac	2008-04-30 02:14:52.000000000 +0200
 @@ -18,7 +18,7 @@
  	AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl])
  fi
@@ -189,6 +201,39 @@
  )
  AC_SUBST(NG_INTERFACE)
  
+@@ -368,20 +368,20 @@
+ AC_SUBST(NG_SRVEXT)
+ 
+ #dnl NG_SRVEXT_DIR
+-#AC_ARG_WITH(ng-srvext-dir,
+-#	AC_HELP_STRING([--with-ng-srvext-dir=DIR], [the serviceext dir for multiple]),
+-#	NG_SRVEXT_DIR=$withval,
+-#	NG_SRVEXT_DIR=/usr/local/nagios/etc/serviceext
+-#)
+-#AC_SUBST(NG_SRVEXT_DIR)
++AC_ARG_WITH(ng-srvext-dir,
++	AC_HELP_STRING([--with-ng-srvext-dir=DIR], [the serviceext dir for multiple]),
++	NG_SRVEXT_DIR=$withval,
++	NG_SRVEXT_DIR=/etc/nagiosgrapher/nagios3/serviceext
++)
++AC_SUBST(NG_SRVEXT_DIR)
+ 
+ #dnl NG_SRVEXT_FILE
+-#AC_ARG_WITH(ng-srvext-file,
+-#	AC_HELP_STRING([--with-ng-srvext-file=FILE], [the serviceext file for single]),
+-#	NG_SRVEXT_FILE=$withval,
+-#	NG_SRVEXT_FILE=/usr/local/nagios/etc/serviceext.cfg
+-#)
+-#AC_SUBST(NG_SRVEXT_FILE)
++AC_ARG_WITH(ng-srvext-file,
++	AC_HELP_STRING([--with-ng-srvext-file=FILE], [the serviceext file for single]),
++	NG_SRVEXT_FILE=$withval,
++	NG_SRVEXT_FILE=/usr/nagiosgrapher/nagios3/serviceext.cfg
++)
++AC_SUBST(NG_SRVEXT_FILE)
+ 
+ #dnl NG_LOGFILE
+ #AC_ARG_WITH(ng-logfile,
 @@ -395,7 +395,7 @@
  AC_ARG_WITH(ng-loglevel,
  	AC_HELP_STRING([--with-ng-loglevel=INT], [the loglevel]),
@@ -199,8 +244,8 @@
  AC_SUBST(NG_LOGLEVEL)
  
 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
+--- nagiosgrapher-1.6.1rc5~/lib/NagiosGrapher.pm.in	2008-04-30 02:01:39.000000000 +0200
++++ nagiosgrapher-1.6.1rc5/lib/NagiosGrapher.pm.in	2008-04-30 02:14:52.000000000 +0200
 @@ -49,7 +49,7 @@
  our $ngraphcfg = '@NG_CONFIG@/ngraph.ncfg';
  our $xmlfile   = 'index.xml';

Modified: nagiosgrapher/trunk/debian/patches/makefiles.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/makefiles.dpatch	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/patches/makefiles.dpatch	2008-04-30 00:27:33 UTC (rev 1432)
@@ -18,13 +18,13 @@
 +	rm -f contrib/fifo_write/C/fifo_write
 +
 +distclean: clean
-+	rm -f bin/collect.pl bin/fifo_write.pl cfg/ngraph.cfg
++	rm -f bin/collect2.pl bin/fifo_write.pl cfg/ngraph.cfg
 +	rm -f contrib/fifo_write/C/fifo_write contrib/udpecho/udpecho
 +	rm -f lib/NagiosGrapher/Hooks/Generic.pm \
 +		lib/NagiosGrapher/Hooks/SrvExtWriteHostextInfo.pm \
 +		lib/NagiosGrapher/HTML.pm \
 +		lib/NagiosGrapher.pm
-+	rm -f nagios_grapher
++	rm -f nagios_grapher nagios_grapher.in
 +	rm -f sbin/graphs.cgi sbin/rrd2-graph.cgi sbin/rrd2-system.cgi
 +	rm -f config.log config.pld config.status configure Makefile
 +

Modified: nagiosgrapher/trunk/debian/postinst.in
===================================================================
--- nagiosgrapher/trunk/debian/postinst.in	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/postinst.in	2008-04-30 00:27:33 UTC (rev 1432)
@@ -5,7 +5,7 @@
 
 set -e
 
-setperm() { # thx 2 nagios2/debian/nagios2-common.postinst
+setperm() { 
 	local user="$1"
 	local group="$2"
 	local mode="$3"
@@ -47,7 +47,8 @@
 	for dir in /var/lib/nagiosgrapher /var/lib/nagiosgrapher/rrd \
 		/var/cache/nagiosgrapher \
 		/var/log/nagiosgrapher \
-		/etc/nagios2/serviceext; do
+		/etc/nagiosgrapher/nagios3 \
+		/etc/nagiosgrapher/nagios3/serviceext; do
 		test -d $dir && setperm nagios nagios 0755 $dir
 	done
 

Added: nagiosgrapher/trunk/debian/postrm.in
===================================================================
--- nagiosgrapher/trunk/debian/postrm.in	                        (rev 0)
+++ nagiosgrapher/trunk/debian/postrm.in	2008-04-30 00:27:33 UTC (rev 1432)
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postrm script for nagiosgrapher
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+CFGS="@@CFGS@@"
+TMPL_CFGS="@@TMPL_CFGS@@"
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+if [ "$1" = "purge" ]; then
+	for cfg in $CFGS; do
+		ucf --purge /etc/nagiosgrapher/$cfg
+		rm -f /etc/nagiosgrapher/$cfg
+	done
+	
+	for tmpl in $TMPL_CFGS; do
+		ucf --purge /etc/nagiosgrapher/ngraph.d/$tmpl
+		rm -f /etc/nagiosgrapher/ngraph.d/$tmpl
+	done
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Modified: nagiosgrapher/trunk/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/rules	2008-04-30 00:27:33 UTC (rev 1432)
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 #CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
-CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg 
+CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg
 TMPL_DIR := extra/ standard/
 
 PKG:=nagiosgrapher
@@ -14,12 +14,11 @@
 
 #DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
 #DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch
+DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch --with-ng-srvext-dir=/etc/nagiosgrapher/nagios3/serviceext --with-ng-srvext-file=/etc/nagiosgrapher/nagios3/serviceext.cfg
 DEB_AUTO_UPDATE_AUTOCONF := 1 
 
 install/$(PKG)::
 	rm -f debian/$(PKG)/usr/lib/$(PKG)/*.c
-	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; \
@@ -30,6 +29,8 @@
 		mv $(PKG_TMP)/etc/$(PKG)/$$cfg* \
 		 $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/$$cfg; \
 	done
+	mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3
+	cp debian/commands.cfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3/
 	
 	# install service perf. templates
 	tmpl_root=$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates; \
@@ -41,7 +42,7 @@
 		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
+	sed "s#@@CFGS@@#$(CFGS) nagios3/commands.cfg#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 \
@@ -49,3 +50,4 @@
 
 clean::
 	rm -f debian/postinst
+	rm -f cfg/ngraph.ncfg

Modified: nagiosgrapher/trunk/debian/watch
===================================================================
--- nagiosgrapher/trunk/debian/watch	2008-04-27 13:51:36 UTC (rev 1431)
+++ nagiosgrapher/trunk/debian/watch	2008-04-30 00:27:33 UTC (rev 1432)
@@ -1,22 +1,6 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php nagiosgrapher-(.*)\.tar\.gz
+opts=versionmangle=s/^([\d\.]+)-?([\d\w]*)(-[\d\.]*)$/$1$2$3/,s/-(.*)$/.$1/ \
+ http://nagiosexchange.altinity.org/nagiosexchange/NagiosGrapher/NagiosGrapher-(\d.*).tar.gz
 
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/nagiosgrapher-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/nagiosgrapher-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-# http://sf.net/nagiosgrapher/nagiosgrapher-(.*)\.tar\.gz
-opts=versionmangle=s/([\d\.]+)-?([\d\w]*)/$1$2/ \
-http://sf.net/nagiosgrapher/NagiosGrapher-(.*).tar.bz2




More information about the Pkg-nagios-changes mailing list