Nagios Support Forum

This is a multi-part message in MIME format.
--------------020108040109060107080707
Content-Type: multipart/alternative;
boundary="------------090107010508060804010107"


--------------090107010508060804010107
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Here is a diff -c output from a patch of nagios.spec.
1) Fixes a problem with new_mini_epn which was not packaged
2) moves resource.cfg in /etc/nagios (instead of /etc/nagios/private) where
I think it is more appropriate.

----------------------------------------------------------------------
Andreas Kasenides
Tel: +357 - 22892714
e-mail: Andreas.Kasenides%at%cs.ucy.ac.cy

(replace the %at% above with @)

--------------090107010508060804010107
Content-Type: text/html; charset=us-ascii
Content-Transfer-Encoding: 7bit








Here is a diff -c output from a patch of nagios.spec.
1) Fixes a problem with new_mini_epn which was not packaged
2) moves resource.cfg in /etc/nagios (instead of /etc/nagios/private)
where
I think it is more appropriate.


Untitled Document

----------------------------------------------------------------------
Andreas
Kasenides
Tel: +357
- 22892714
e-mail: Andreas.Kasenides%at%cs.ucy.ac.cy
(replace the %at% above with @)





--------------090107010508060804010107--

--------------020108040109060107080707
Content-Type: text/plain;
name="nagios.spec.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="nagios.spec.diff"

*** nagios.spec.orig 2005-11-22 13:34:32.000000000 +0200
--- nagios.spec 2005-11-22 13:29:30.000000000 +0200
***************
*** 1,6 ****
%define name nagios
%define version 2.0b5
! %define release 1
%define nsusr nagios
%define nsgrp nagios
%define cmdgrp nagiocmd
--- 1,6 ----
%define name nagios
%define version 2.0b5
! %define release 1.fc4.test
%define nsusr nagios
%define nsgrp nagios
%define cmdgrp nagiocmd
***************
*** 215,225 ****
make all

# make sample configs
! cd sample-config
! F=`mktemp temp.XXXXXX`
! sed -e 's=/var/log/nagios/rw/=/var/spool/nagios/=;s=@sysconfdir@/resource.cfg=@sysconfdir@/private/resource.cfg=' nagios.cfg > ${F}
! mv ${F} nagios.cfg
! cd ..

# make daemonchk.cgi and event handlers
cd contrib
--- 215,225 ----
make all

# make sample configs
! ###cd sample-config
! ###F=`mktemp temp.XXXXXX`
! ###sed -e 's=/var/log/nagios/rw/=/var/spool/nagios/=;s=@sysconfdir@/resource.cfg=@sysconfdir@/private/resource.cfg=' nagios.cfg > ${F}
! ###mv ${F} nagios.cfg
! ###cd ..

# make daemonchk.cgi and event handlers
cd contrib
***************
*** 243,249 ****
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/httpd/conf.d
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/nagios
! install -d -m 0755 ${RPM_BUILD_ROOT}/etc/nagios/private
make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" install
make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit

--- 243,249 ----
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/httpd/conf.d
install -d -m 0755 ${RPM_BUILD_ROOT}/etc/nagios
! ### install -d -m 0755 ${RPM_BUILD_ROOT}/etc/nagios/private
make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" install
make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit

***************
*** 252,260 ****
for f in {nagios,cgi}.cfg ; do
[ -f $f ] && install -c -m 664 $f ${RPM_BUILD_ROOT}/etc/nagios/${f}
done
! mkdir -p ${RPM_BUILD_ROOT}/etc/nagios/pri

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]