OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Nov-2003 17:33:39
Branch: HEAD Handle: 2003111016333702
Modified files:
openpkg-src/nagios fsl.nagios nagios.spec rc.nagios
openpkg-web news.txt
Log:
PR #202, various basic corrections
Summary:
Revision Changes Path
1.7 +1 -1 openpkg-src/nagios/fsl.nagios
1.20 +18 -3 openpkg-src/nagios/nagios.spec
1.12 +67 -26 openpkg-src/nagios/rc.nagios
1.7351 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/fsl.nagios
============================================================================
$ cvs diff -u -r1.6 -r1.7 fsl.nagios
--- openpkg-src/nagios/fsl.nagios 14 Jul 2003 18:32:31 -0000 1.6
+++ openpkg-src/nagios/fsl.nagios 10 Nov 2003 16:33:39 -0000 1.7
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/nagios/nagios.log",
- perm=0644
+ perm=0644, jitter=1, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 nagios.spec
--- openpkg-src/nagios/nagios.spec 22 Jul 2003 19:38:56 -0000 1.19
+++ openpkg-src/nagios/nagios.spec 10 Nov 2003 16:33:39 -0000 1.20
@@ -33,7 +33,7 @@
Group: Network
License: GNU
Version: 1.1
-Release: 20030722
+Release: 20031110
# package options
%option with_fsl yes
@@ -52,8 +52,8 @@
BuildPreReq: gd, jpeg, png, zlib
PreReq: gd, jpeg, png, zlib
%if "%{with_fsl}" == "yes"
-BuildPreReq: fsl >= 1.2.0
-PreReq: fsl >= 1.2.0
+BuildPreReq: fsl >= 1.3.0
+PreReq: fsl >= 1.3.0
%endif
AutoReq: no
AutoReqProv: no
@@ -193,4 +193,19 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} nagios status 2>/dev/null`
+ [ ".$nagios_active" = .yes ] && %{l_rc} nagios restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} nagios stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/nagios/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/nagios/status.sav >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/rc.nagios
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.nagios
--- openpkg-src/nagios/rc.nagios 22 Jul 2003 08:10:54 -0000 1.11
+++ openpkg-src/nagios/rc.nagios 10 Nov 2003 16:33:39 -0000 1.12
@@ -6,42 +6,83 @@
%config
nagios_enable="$openpkg_rc_def"
nagios_cfg="nagios.cfg"
- nagios_log_prolog="true"
- nagios_log_epilog="true"
- nagios_log_numfiles="10"
- nagios_log_minsize="1M"
- nagios_log_complevel="9"
+ nagios_comment_file="@l_prefix@/var/nagios/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_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_prolog="true"
+ nagios_nagios_epilog="true"
+ nagios_nagios_numfiles="10"
+ nagios_nagios_minsize="1M"
+ nagios_nagios_complevel="9"
-%start
+%common
+ nagios_pidfile="@l_prefix@/var/nagios/nagios.lock"
+ nagios_signal () {
+ [ -f $nagios_pidfile ] && kill -$1 `cat $nagios_pidfile`
+ }
+
+%status -u @l_musr@ -o
+ nagios_usable="unknown"
+ nagios_active="no"
+ rcService nagios enable yes && \
+ nagios_signal 0 && nagios_active="yes"
+ echo "nagios_enable=\"$nagios_enable\""
+ echo "nagios_usable=\"$nagios_usable\""
+ echo "nagios_active=\"$nagios_active\""
+
+%start -u @l_musr@
rcService nagios enable yes || exit 0
+ rcService nagios active yes && exit 0
@l_prefix@/sbin/nagios -d @l_prefix@/etc/nagios/$nagios_cfg >/dev/null 2>&1
-%stop
+%stop -u @l_musr@
rcService nagios enable yes || exit 0
- if [ -f @l_prefix@/var/nagios/nagios.pid ]; then
- kill -TERM `cat @l_prefix@/var/nagios/nagios.lock`
- fi
+ rcService nagios active no && exit 0
+ nagios_signal TERM
+ rm -f $nagios_pidfile
-%restart
+%restart -u @l_musr@
rcService nagios enable yes || exit 0
- if [ -f @l_prefix@/var/nagios/nagios.pid ]; then
- kill -TERM `cat @l_prefix@/var/nagios/nagios.lock`
- sleep 2
- fi
- @l_prefix@/bin/nagios -d @l_prefix@/etc/nagios/$nagios_cfg >/dev/null 2>&1
+ rcService nagios active no && exit 0
+ rc nagios stop
+ sleep 2
+ rc nagios start
-%reload -u @l_susr@
+%reload -u @l_musr@
rcService nagios enable yes || exit 0
- if [ -f @l_prefix@/var/nagios/nagios.pid ]; then
- kill -HUP `cat @l_prefix@/var/nagios/nagios.lock`
- fi
+ rcService nagios active no && exit 0
+ nagios_signal HUP
-%daily -u @l_susr@
+%daily -u @l_musr@
rcService nagios enable yes || exit 0
+
+ # rotate logfiles
+ shtool rotate -f \
+ -n ${nagios_nagios_numfiles} -s ${nagios_nagios_minsize} -d \
+ -z ${nagios_nagios_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+ -P "${nagios_nagios_prolog}" \
+ -E "${nagios_nagios_epilog}" \
+ ${nagios_nagios_file}
+ shtool rotate -f \
+ -n ${nagios_comment_numfiles} -s ${nagios_comment_minsize} -d \
+ -z ${nagios_comment_complevel} -o @l_musr@ -g @l_mgrp@ -m 664 \
+ -P "${nagios_comment_prolog}" \
+ -E "${nagios_comment_epilog}" \
+ ${nagios_comment_file}
shtool rotate -f \
- -n ${nagios_log_numfiles} -s ${nagios_log_minsize} -d \
- -z ${nagios_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
- -P "${nagios_log_prolog}" \
- -E "${nagios_log_epilog}" \
- @l_prefix@/var/nagios/nagios.log
+ -n ${nagios_downtime_numfiles} -s ${nagios_downtime_minsize} -d \
+ -z ${nagios_downtime_complevel} -o @l_musr@ -g @l_mgrp@ -m 664 \
+ -P "${nagios_downtime_prolog}" \
+ -E "${nagios_downtime_epilog}" \
+ ${nagios_downtime_file}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7350 -r1.7351 news.txt
--- openpkg-web/news.txt 10 Nov 2003 15:56:51 -0000 1.7350
+++ openpkg-web/news.txt 10 Nov 2003 16:33:37 -0000 1.7351
@@ -1,3 +1,4 @@
+10-Nov-2003: Upgraded package: P<nagios-1.1-20031110>
10-Nov-2003: Upgraded package: P<cfg-0.9.1-20031110>
10-Nov-2003: Upgraded package: P<l2-0.9.5-20031110>
10-Nov-2003: Upgraded package: P<fribidi-0.10.4-20031110>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
