packages: monit/monit.init, monit/monit.spec, monit/monit.config (NEW) - re...

[mmazur]

Author: mmazur                       Date: Tue Sep  8 10:56:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- add sysconfig/monit support
- fix stopping in init.d (use killproc); didn't work for me

---- Files affected:
packages/monit:
   monit.init (1.15 -> 1.16) , monit.spec (1.49 -> 1.50) , monit.config (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/monit/monit.init
diff -u packages/monit/monit.init:1.15 packages/monit/monit.init:1.16
--- packages/monit/monit.init:1.15	Wed Dec  3 02:13:49 2008
+++ packages/monit/monit.init	Tue Sep  8 12:56:11 2009
@@ -14,7 +14,7 @@
 
 checkconfig() {
 	local out
-	out=$(monit -c /etc/monitrc -t 2>&1)
+	out=$(/usr/sbin/monit -c /etc/monitrc -t 2>&1)
 	ret=$?
 	if [ $ret != 0 ]; then
 		echo >&2 "$out"
@@ -27,7 +27,7 @@
 	if [ ! -f /var/lock/subsys/monit ]; then
 		checkconfig
 		msg_starting monit
-		daemon /usr/sbin/monit -c /etc/monitrc -l syslog -d 60 -s /var/run/monit.state
+		daemon /usr/sbin/monit -c /etc/monitrc -s /var/run/monit.state $OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/monit
 	else
@@ -39,7 +39,7 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/monit ]; then
 		msg_stopping monit
-		daemon --waitforname monit --waitfortime 10 monit -c /etc/monitrc quit
+		killproc --waitfortime 10 monit
 		rm -f /var/lock/subsys/monit > /dev/null 2>&1
 	else
 		msg_not_running monit

================================================================
Index: packages/monit/monit.spec
diff -u packages/monit/monit.spec:1.49 packages/monit/monit.spec:1.50
--- packages/monit/monit.spec:1.49	Tue Jun  2 14:52:49 2009
+++ packages/monit/monit.spec	Tue Sep  8 12:56:11 2009
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Narzędzie do monitorowania procesów i ich restartowania
 Name:		monit
 Version:	5.0.3
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Console
 Source0:	http://mmonit.com/monit/dist/%{name}-%{version}.tar.gz
 # Source0-md5:	dae7859ec10551fc941daeae60dee9d3
 Source1:	%{name}.init
 Source2:	%{name}rc
+Source3:	%{name}.config
 URL:		http://mmonit.com/monit/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -41,7 +42,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit,sysconfig},%{_sbindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -49,6 +50,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 # NOTE: 'include *.monitrc' will fail if nothing matches the glob.
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/monit
 install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/monit
 
@@ -70,6 +72,7 @@
 %doc doc/*.html CHANGES.txt CONTRIBUTORS FAQ.txt README*
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}rc
 %dir %attr(751,root,root) %{_sysconfdir}/monit
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/monit
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/default.monitrc
 %attr(755,root,root) %{_sbindir}/monit
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
@@ -81,6 +84,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2009/09/08 10:56:11  mmazur
+- rel 2
+- add sysconfig/monit support
+- fix stopping in init.d (use killproc); didn't work for me
+
 Revision 1.49  2009/06/02 12:52:49  lisu
 - 5.0.3
 

================================================================
Index: packages/monit/monit.config
diff -u /dev/null packages/monit/monit.config:1.1
--- /dev/null	Tue Sep  8 12:56:18 2009
+++ packages/monit/monit.config	Tue Sep  8 12:56:11 2009
@@ -0,0 +1,5 @@
+# configuration for monit
+
+# you can specify options for monit here
+OPTIONS="-l syslog -d 60"
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monit/monit.init?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/monit/monit.spec?r1=1.49&r2=1.50&f=u