- 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
--- /dev/null
+# configuration for monit
+
+# you can specify options for monit here
+OPTIONS="-l syslog -d 60"
+
checkconfig() {
local out
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"
ret=$?
if [ $ret != 0 ]; then
echo >&2 "$out"
if [ ! -f /var/lock/subsys/monit ]; then
checkconfig
msg_starting monit
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
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/monit
else
# Stop daemons.
if [ -f /var/lock/subsys/monit ]; then
msg_stopping monit
# 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
rm -f /var/lock/subsys/monit > /dev/null 2>&1
else
msg_not_running monit
Summary(pl.UTF-8): Narzędzie do monitorowania procesów i ich restartowania
Name: monit
Version: 5.0.3
Summary(pl.UTF-8): Narzędzie do monitorowania procesów i ich restartowania
Name: monit
Version: 5.0.3
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
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
URL: http://mmonit.com/monit/
BuildRequires: bison
BuildRequires: flex
URL: http://mmonit.com/monit/
BuildRequires: bison
BuildRequires: flex
%install
rm -rf $RPM_BUILD_ROOT
%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
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
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 %{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
install monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit/default.monitrc
mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/monit
%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
%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}
%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}