[CVS] OpenPKG: openpkg-src/monit/ monit.spec rc.monit openpkg-web/ new...
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:
RevisionChanges 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 - 1.20
+++ openpkg-src/monit/monit.spec 23 Jul 2003 09:38:55 - 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.monit22 Jul 2003 08:10:52 - 1.13
+++ openpkg-src/monit/rc.monit23 Jul 2003 09:38:55 - 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 - 1.5741
+++ openpkg-web/news.txt 23 Jul 2003 09:38:53 - 1.5742
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: Pmonit-3.2-20030723
23-Jul-2003: Upgraded package: Pbogofilter-0.14.0-20030723
23-Jul-2003: Upgraded package: Psendmail-8.12.9-20030723
23-Jul-2003: Upgraded package: Prt-3.0.4-20030723
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/monit/ monit.spec rc.monit openpkg-web/ new...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jun-2003 15:54:39
Branch: HEAD Handle: 2003062814543702
Modified files:
openpkg-src/monit monit.spec rc.monit
openpkg-web news.txt
Log:
fix introduced logfile path
Summary:
RevisionChanges Path
1.8 +1 -1 openpkg-src/monit/monit.spec
1.7 +1 -1 openpkg-src/monit/rc.monit
1.5047 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/monit/monit.spec
$ cvs diff -u -r1.7 -r1.8 monit.spec
--- openpkg-src/monit/monit.spec 24 Jun 2003 16:13:00 - 1.7
+++ openpkg-src/monit/monit.spec 28 Jun 2003 13:54:39 - 1.8
@@ -33,7 +33,7 @@
Group:System
License: GPL
Version: 3.2
-Release: 20030624
+Release: 20030628
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/monit/rc.monit
$ cvs diff -u -r1.6 -r1.7 rc.monit
--- openpkg-src/monit/rc.monit24 Jun 2003 16:13:00 - 1.6
+++ openpkg-src/monit/rc.monit28 Jun 2003 13:54:39 - 1.7
@@ -45,5 +45,5 @@
-z${monit_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P ${monit_log_prolog} \
-E ${monit_log_epilog} \
-@l_prefix@/var/monit/log/monit.log
+@l_prefix@/var/monit/monit.log
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5046 -r1.5047 news.txt
--- openpkg-web/news.txt 28 Jun 2003 13:44:05 - 1.5046
+++ openpkg-web/news.txt 28 Jun 2003 13:54:37 - 1.5047
@@ -1,3 +1,4 @@
+28-Jun-2003: Upgraded package: Pmonit-3.2-20030628
28-Jun-2003: Upgraded package: Ppostfix-2.0.12-20030628
28-Jun-2003: Upgraded package: Paica-0.81-20030628
28-Jun-2003: Upgraded package: Psquirrelmail-1.4.0-20030628
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/monit/ monit.spec rc.monit openpkg-web/ new...
On Tue, Jun 24, 2003, Thomas Lotterer wrote:
[...]
add/unify log file trimming
[...]
-@l_prefix@/var/monit/monit.log
+-E ${monit_log_epilog} \
+@l_prefix@/var/monit/log/monit.log
[...]
I know that cut paste makes it possible (tm), but
please be more careful in upgrading those rotation constructs:
The logfile still is @l_prefix@/var/monit/monit.log unless
you change this in the fsl.monit, too. I've fixed it now.
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/monit/ monit.spec rc.monit openpkg-web/ new...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jun-2003 15:27:11
Branch: HEAD Handle: 2003062414270901
Modified files:
openpkg-src/monit monit.spec rc.monit
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
RevisionChanges Path
1.6 +1 -1 openpkg-src/monit/monit.spec
1.5 +6 -3 openpkg-src/monit/rc.monit
1.4987 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/monit/monit.spec
$ cvs diff -u -r1.5 -r1.6 monit.spec
--- openpkg-src/monit/monit.spec 23 Jun 2003 20:50:36 - 1.5
+++ openpkg-src/monit/monit.spec 24 Jun 2003 13:27:10 - 1.6
@@ -33,7 +33,7 @@
Group:System
License: GPL
Version: 3.2
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-src/monit/rc.monit
$ cvs diff -u -r1.4 -r1.5 rc.monit
--- openpkg-src/monit/rc.monit24 Jun 2003 12:07:52 - 1.4
+++ openpkg-src/monit/rc.monit24 Jun 2003 13:27:10 - 1.5
@@ -38,9 +38,12 @@
%daily -u @l_susr@
opServiceEnabled monit || exit 0
+
+# rotate logfile
shtool rotate -f \
-n${monit_log_numfiles} -s${monit_log_minsize} -d \
--z${monit_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m600 \
+-z${monit_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P ${monit_log_prolog} \
--E @l_prefix@/etc/rc.d/rc.monit reload; ${monit_log_epilog} \
-@l_prefix@/var/monit/monit.log
+-E ${monit_log_epilog} \
+@l_prefix@/var/monit/log/monit.log
+
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4986 -r1.4987 news.txt
--- openpkg-web/news.txt 24 Jun 2003 13:26:53 - 1.4986
+++ openpkg-web/news.txt 24 Jun 2003 13:27:09 - 1.4987
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: Pmonit-3.2-20030624
24-Jun-2003: Upgraded package: Pimapd-2.1.13-20030624
24-Jun-2003: Upgraded package: Phoneyd-0.5a-20030624
24-Jun-2003: Upgraded package: Parpd-0.2-20030624
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
