OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Mar-2006 21:45:55
Branch: HEAD Handle: 2006030320455401
Modified files:
openpkg-src/nagios fsl.nagios nagios.spec rc.nagios
Log:
adjust path of logfiles in OSSP fsl and run-command script to reflect
path in config files; some packaging cosmetics
Summary:
Revision Changes Path
1.8 +1 -1 openpkg-src/nagios/fsl.nagios
1.45 +11 -7 openpkg-src/nagios/nagios.spec
1.15 +3 -3 openpkg-src/nagios/rc.nagios
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/fsl.nagios
============================================================================
$ cvs diff -u -r1.7 -r1.8 fsl.nagios
--- openpkg-src/nagios/fsl.nagios 10 Nov 2003 16:33:39 -0000 1.7
+++ openpkg-src/nagios/fsl.nagios 3 Mar 2006 20:45:54 -0000 1.8
@@ -8,7 +8,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/nagios/nagios.log",
+ path="@l_prefix@/var/nagios/log/nagios.log",
perm=0644, jitter=1, monitor=3600
)
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 nagios.spec
--- openpkg-src/nagios/nagios.spec 8 Feb 2006 07:29:27 -0000 1.44
+++ openpkg-src/nagios/nagios.spec 3 Mar 2006 20:45:55 -0000 1.45
@@ -37,7 +37,7 @@
Group: Network
License: GNU
Version: %{V_nagios}
-Release: 20060208
+Release: 20060303
# package options
%option with_eperl yes
@@ -100,6 +100,7 @@
nagios-plugins-%{V_nagios_plugins}/configure
%build
+ # configure and build Nagios
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
@@ -123,10 +124,10 @@
--enable-embedded-perl \
%endif
--without-init-dir
+ %{l_make} %{l_mflags} all \
+ GDLIBS="-lgd -lm -lpng -lz -ljpeg"
- %{l_make} %{l_mflags} all GDLIBS="-lgd -lm -lpng -lz -ljpeg"
-
- # configure and build plugins
+ # configure and build Nagios plugins
( cd nagios-plugins-%{V_nagios_plugins}/
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -150,6 +151,7 @@
%install
rm -rf $RPM_BUILD_ROOT
+ # create installation hierarchy
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
@@ -157,9 +159,10 @@
$RPM_BUILD_ROOT%{l_prefix}/var/nagios/log \
$RPM_BUILD_ROOT%{l_prefix}/var/nagios/rw
+ # install Nagios
%{l_make} install DESTDIR="$RPM_BUILD_ROOT" INSTALL_OPTS=""
COMMAND_OPTS=""
- # install plugins
+ # install Nagios plugins
( cd nagios-plugins-%{V_nagios_plugins}/
%{l_make} install DESTDIR="$RPM_BUILD_ROOT"
) || exit $?
@@ -168,12 +171,13 @@
%{l_shtool} install -c -m 644 %{l_value -s -a} \
etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
- # install start script
+ # install run-command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.nagios} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# install OSSP fsl configuration
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE fsl.nagios} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/rc.nagios
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.nagios
--- openpkg-src/nagios/rc.nagios 1 Apr 2004 14:25:55 -0000 1.14
+++ openpkg-src/nagios/rc.nagios 3 Mar 2006 20:45:55 -0000 1.15
@@ -6,19 +6,19 @@
%config
nagios_enable="$openpkg_rc_def"
nagios_cfg="nagios.cfg"
- nagios_comment_file="@l_prefix@/var/nagios/comment.log"
+ nagios_comment_file="@l_prefix@/var/nagios/log/comment.log"
nagios_comment_prolog="true"
nagios_comment_epilog="true"
nagios_comment_numfiles="10"
nagios_comment_minsize="1M"
nagios_comment_complevel="9"
- nagios_downtime_file="@l_prefix@/var/nagios/downtime.log"
+ nagios_downtime_file="@l_prefix@/var/nagios/log/downtime.log"
nagios_downtime_prolog="true"
nagios_downtime_epilog="true"
nagios_downtime_numfiles="10"
nagios_downtime_minsize="1M"
nagios_downtime_complevel="9"
- nagios_nagios_file="@l_prefix@/var/nagios/nagios.log"
+ nagios_nagios_file="@l_prefix@/var/nagios/log/nagios.log"
nagios_nagios_prolog="true"
nagios_nagios_epilog="true"
nagios_nagios_numfiles="10"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
