packages: nagios/config.patch, nagios/nagios.spec, nagios/cgi.cfg.patch (RE...

[glen]

Author: glen                         Date: Mon Aug  3 15:54:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resource.cfg and nagios.cfg also based on upstream version

---- Files affected:
packages/nagios:
   config.patch (1.1 -> 1.2) , nagios.spec (1.126 -> 1.127) , cgi.cfg.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nagios/config.patch
diff -u packages/nagios/config.patch:1.1 packages/nagios/config.patch:1.2
--- packages/nagios/config.patch:1.1	Mon Aug  3 17:38:08 2009
+++ packages/nagios/config.patch	Mon Aug  3 17:54:48 2009
@@ -36,3 +36,90 @@
  
 -
 +# vim:ts=8:sw=8:syn=cfg
+--- nagios-3.1.2/sample-config/resource.cfg.in	2009-08-03 18:41:56.770015075 +0300
++++ svn/nagios-config/trunk/resource.cfg	2009-08-03 18:42:15.413396493 +0300
+@@ -1,8 +1,6 @@
+ ###########################################################################
+ #
+-# RESOURCE.CFG - Sample Resource File for Nagios @VERSION@
+-#
+-# Last Modified: 09-10-2003
++# RESOURCE.CFG - Resource File for Nagios
+ #
+ # You can define $USERx$ macros in this file, which can in turn be used
+ # in command definitions in your host config file(s).  $USERx$ macros are
+--- nagios-3.1.2/sample-config/nagios.cfg.in~	2009-08-03 18:45:46.405840760 +0300
++++ nagios-3.1.2/sample-config/nagios.cfg.in	2009-08-03 18:45:46.405840760 +0300
+@@ -1,13 +1,11 @@
+ ##############################################################################
+ #
+-# NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@
++# NAGIOS.CFG - Main Config File for Nagios
+ #
+ # Read the documentation for more information on this configuration
+ # file.  I've provided some comments here, but things may not be so
+ # clear without further explanation.
+ #
+-# Last Modified: 12-14-2008
+-#
+ ##############################################################################
+ 
+ 
+@@ -16,7 +14,7 @@
+ # for historical purposes.  This should be the first option specified
+ # in the config file!!!
+ 
+-log_file=@localstatedir@/nagios.log
++log_file=/var/log/nagios/nagios.log
+ 
+ 
+ 
+@@ -49,6 +47,10 @@
+ # extension) in a particular directory by using the cfg_dir
+ # directive as shown below:
+ 
++cfg_dir=/etc/nagios/plugins
++cfg_dir=/etc/nagios/local
++#cfg_dir=etc/nagios/objects
++
+ #cfg_dir=@sysconfdir@/servers
+ #cfg_dir=@sysconfdir@/printers
+ #cfg_dir=@sysconfdir@/switches
+@@ -264,7 +266,7 @@
+ # This is the directory where archived (rotated) log files should be
+ # placed (assuming you've chosen to do log rotation).
+ 
+-log_archive_path=@localstatedir@/archives
++log_archive_path=/var/log/nagios/archives
+ 
+ 
+ 
+@@ -850,8 +852,8 @@
+ # Performance data is only written to these files if the
+ # enable_performance_data option (above) is set to 1.
+ 
+-#host_perfdata_file=/tmp/host-perfdata
+-#service_perfdata_file=/tmp/service-perfdata
++#host_perfdata_file=@localstatedir@/host-perfdata
++#service_perfdata_file=@localstatedir@/service-perfdata
+ 
+ 
+ 
+@@ -1065,7 +1067,7 @@
+ #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)
+ #
+ 
+-date_format=us
++date_format=iso8601
+ 
+ 
+ 
+@@ -1306,7 +1308,7 @@
+ # DEBUG FILE
+ # This option determines where Nagios should write debugging information.
+ 
+-debug_file=@localstatedir@/nagios.debug
++debug_file=/var/log/nagios/nagios.debug
+ 
+ 
+ 

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.126 packages/nagios/nagios.spec:1.127
--- packages/nagios/nagios.spec:1.126	Mon Aug  3 17:38:08 2009
+++ packages/nagios/nagios.spec	Mon Aug  3 17:54:48 2009
@@ -28,7 +28,7 @@
 Patch2:		%{name}-webapps.patch
 Patch3:		%{name}-cgi-http_charset.patch
 Patch4:		%{name}-cmd-typo.patch
-Patch5:		cgi.cfg.patch
+Patch5:		config.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -199,7 +199,7 @@
 	s,/usr/local/nagios/share, at datadir@,g
 	# we want all authorized users have default access
 	s,=nagiosadmin,=*,g
-' sample-config/cgi.cfg.in
+' sample-config/*.cfg.in
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -246,7 +246,8 @@
 
 # install templated configuration files
 tar jxf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_sysconfdir}
-sed -i -e 's,%{_prefix}/lib/,%{_libdir}/,' $RPM_BUILD_ROOT%{_sysconfdir}/resource.cfg
+cp -a sample-config/resource.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a sample-config/nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}
 
 # webserver files
 install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
@@ -517,6 +518,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2009/08/03 15:54:48  glen
+- resource.cfg and nagios.cfg also based on upstream version
+
 Revision 1.126  2009/08/03 15:38:08  glen
 - use upstream cgi.cfg as base
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/config.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.126&r2=1.127&f=u