OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 11:38:55
Branch: HEAD Handle: 2003072310385302
Modified files:
openpkg-src/monit monit.spec rc.monit
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.21 +1 -2 openpkg-src/monit/monit.spec
1.14 +22 -13 openpkg-src/monit/rc.monit
1.5742 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 monit.spec
--- openpkg-src/monit/monit.spec 22 Jul 2003 08:10:52 -0000 1.20
+++ openpkg-src/monit/monit.spec 23 Jul 2003 09:38:55 -0000 1.21
@@ -33,7 +33,7 @@
Group: System
License: GPL
Version: 3.2
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ -120,7 +120,6 @@
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.monit' \
'%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit/*' \
- '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit' \
'%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/monit'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/rc.monit
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.monit
--- openpkg-src/monit/rc.monit 22 Jul 2003 08:10:52 -0000 1.13
+++ openpkg-src/monit/rc.monit 23 Jul 2003 09:38:55 -0000 1.14
@@ -11,30 +11,39 @@
monit_log_minsize="1M"
monit_log_complevel="9"
+%common
+ monit_pidfile="@l_prefix@/var/monit/monit.pid"
+ monit_signal () {
+ [ -f $monit_pidfile ] && kill -$1 `cat $monit_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ monit_usable="no"
+ monit_active="no"
+ rcService monit enable yes && \
+ @l_prefix@/bin/monit -t && monit_usable="yes"
+ rcService monit enable yes && \
+ monit_signal 0 && monit_active="yes"
+ echo "monit_enable=\"$monit_enable\""
+ echo "monit_usable=\"$monit_usable\""
+ echo "monit_active=\"$monit_active\""
+
%start -u @l_susr@
rcService monit enable yes || exit 0
- @l_prefix@/bin/monit
+ @l_prefix@/bin/monit >/dev/null
%stop -u @l_susr@
rcService monit enable yes || exit 0
- if [ -f @l_prefix@/var/monit/monit.pid ]; then
- kill -TERM `cat @l_prefix@/var/monit/monit.pid`
- rm -f @l_prefix@/var/monit/monit.pid
- fi
+ @l_prefix@/bin/monit quit
%restart -u @l_susr@
rcService monit enable yes || exit 0
- if [ -f @l_prefix@/var/monit/monit.pid ]; then
- kill -TERM `cat @l_prefix@/var/monit/monit.pid`
- rm -f @l_prefix@/var/monit/monit.pid
- fi
- @l_prefix@/bin/monit
+ @l_prefix@/bin/monit quit
+ @l_prefix@/bin/monit >/dev/null
%reload -u @l_susr@
rcService monit enable yes || exit 0
- if [ -f @l_prefix@/var/monit/monit.pid ]; then
- kill -HUP `cat @l_prefix@/var/monit/monit.pid`
- fi
+ @l_prefix@/bin/monit restart
%daily -u @l_susr@
rcService monit enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5741 -r1.5742 news.txt
--- openpkg-web/news.txt 23 Jul 2003 09:14:29 -0000 1.5741
+++ openpkg-web/news.txt 23 Jul 2003 09:38:53 -0000 1.5742
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<monit-3.2-20030723>
23-Jul-2003: Upgraded package: P<bogofilter-0.14.0-20030723>
23-Jul-2003: Upgraded package: P<sendmail-8.12.9-20030723>
23-Jul-2003: Upgraded package: P<rt-3.0.4-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
