- rel 2

- add sysconfig/monit support
- fix stopping in init.d (use killproc); didn't work for me

Changed files:
    monit.config -> 1.1
    monit.init -> 1.16
    monit.spec -> 1.50

diff --git a/monit.config b/monit.config
new file mode 100644 (file)
index 0000000..ac3c96a
--- /dev/null
+++ b/monit.config
@@ -0,0 +1,5 @@
+# configuration for monit
+
+# you can specify options for monit here
+OPTIONS="-l syslog -d 60"
+

diff --git a/monit.init b/monit.init
index 904511280492eae2a1688b642df58c054e51f26b..1cb46fc6c55194e0900f62f913fe6f901826d4f6 100644 (file)
--- a/monit.init
+++ b/monit.init
@@ -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 @@ start() {
        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() {
        # 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

diff --git a/monit.spec b/monit.spec
index aa9ee8206054f53c52e9687e85fc015c2011b9fd..dfd18b995579dabe86bb17013520dc1d08c3906e 100644 (file)
--- a/monit.spec
+++ b/monit.spec
@@ -3,13 +3,14 @@ Summary:      Process monitor and restart utility
 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
@@ -40,7 +41,7 @@ program przestaje odpowiadać.
 
 %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
@@ -48,6 +49,7 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,monit},%{_sbindir}}
 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
 
@@ -69,6 +71,7 @@ fi
 %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}