[monit: 11/17] New upstream release 5.3.1 First release converted to systemd
Maxim Burgerhout
wzzrd at fedoraproject.org
Fri Dec 2 22:16:49 UTC 2011
commit afb73031f676576438a081518c82496ec15c6d7a
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date: Sun Nov 13 09:29:00 2011 +0100
New upstream release 5.3.1
First release converted to systemd
monit-sysv-initscript | 85 -------------------------------------------------
monit.logrotate | 1 -
monit.service | 8 ++--
monit.spec | 79 +++++++++++++++++++--------------------------
4 files changed, 37 insertions(+), 136 deletions(-)
---
diff --git a/monit.logrotate b/monit.logrotate
index 065bfed..e9c62b2 100644
--- a/monit.logrotate
+++ b/monit.logrotate
@@ -4,7 +4,6 @@
size 100k
create 0644 root root
postrotate
- /sbin/service monit condrestart > /dev/null 2>&1 || :
/bin/systemctl reload monit.service > /dev/null 2>&1 || :
endscript
}
diff --git a/monit.service b/monit.service
index 2ed6d09..0edaf19 100644
--- a/monit.service
+++ b/monit.service
@@ -3,10 +3,10 @@ Description=Monit process and file monitoring utility
After=network.target
[Service]
-ExecStart=/usr/bin/monit -c /etc/monitrc
-Type=forking
-PIDFile=/var/run/monit.pid
-ExecReload=/usr/bin/monit -c /etc/monitrc reload
+ExecStart=/usr/bin/monit -I -c /etc/monitrc
+Type=simple
+PIDFile=/run/monit.pid
+ExecReload=/usr/bin/monit -I -c /etc/monitrc reload
[Install]
WantedBy=multi-user.target
diff --git a/monit.spec b/monit.spec
index 038fa9c..d35cf96 100644
--- a/monit.spec
+++ b/monit.spec
@@ -1,27 +1,27 @@
Name: monit
-Version: 5.2.5
-Release: 2%{?dist}
+Version: 5.3.1
+Release: 1%{?dist}
Summary: Manages and monitors processes, files, directories and devices
Group: Applications/Internet
-License: GPLv3+
+License: AGPL
URL: http://www.tildeslash.com/monit
Source0: http://www.tildeslash.com/monit/dist/monit-%{version}.tar.gz
-Source1: monit-sysv-initscript
Source2: monit.logrotate
Source3: monit.service
Source4: monit-logging-conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex
-BuildRequires: openssl-devel
-BuildRequires: pam-devel
-BuildRequires: byacc
+BuildRequires: flex
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: byacc
+BuildRequires: systemd-units
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires(post): systemd-units
+Requires(post): systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%package sysvinit
Summary: Contains the obsolete sysv init script for monit
@@ -31,10 +31,6 @@ monit is a utility for managing and monitoring, processes, files, directories
and devices on a UNIX system. Monit conducts automatic maintenance and repair
and can execute meaningful causal actions in error situations.
-%description sysvinit
-This package contains the deprecated sysv style init script for Monit. The main
-package includes a service file for systemd.
-
%prep
%setup -q
@@ -47,7 +43,6 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/monit
install -p -D -m0600 monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
install -p -D -m0755 monit $RPM_BUILD_ROOT%{_bindir}/monit
@@ -58,7 +53,7 @@ install -m0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/monit.log
# systemd service file
mkdir -p ${RPM_BUILD_ROOT}/lib/systemd/system
-install -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/lib/systemd/system/monit.service
+install -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/monit.service
# Let's include some good defaults
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/monit.d
@@ -74,52 +69,44 @@ install -p -D -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging
rm -rf $RPM_BUILD_ROOT
%post
-# This reload systemd after installing / updating the service file
-/bin/systemctl daemon-reload &> /dev/null || :
-
-%post sysvinit
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add monit
-
-%preun
-if [ $1 = 0 ]; then
- /bin/systemctl disable monit.service &> /dev/null
- /bin/systemctl stop monit.service &> /dev/null
+if [ $1 -eq 1 ]; then
+ /bin/systemctl enable monit.service > /dev/null 2>&1 || :
fi
-
-%preun sysvinit
-if [ $1 = 0 ]; then
- /sbin/chkconfig --del monit
+if [ -f /etc/monit.conf ]; then
+ mv /etc/monitrc /etc/monitrc.rpmnew
+ mv /etc/monit.conf /etc/monitrc
fi
-%postun
-if [ $1 -ge 1 ]; then
- /bin/systemctl try-restart monit.service &> /dev/null || :
+%preun
+if [ $1 -eq 0 ]; then
+ /bin/systemctl --no-reload disable monit.service > /dev/null 2>&1 || :
+ /bin/systemctl stop monit.service > /dev/null 2>&1 || :
fi
-%postun sysvinit
+%postun
+/bin/systemctl daemon-reload > /dev/null 2>&1 || :
if [ $1 -ge 1 ]; then
- /sbin/service monit condrestart >/dev/null &> /dev/null
+ /bin/systemctl try-restart monit.service > /dev/null 2>&1 || :
fi
-%triggerpostun -n monit-sysvinit -- monit < 5.2.5-2
-/sbin/chkconfig --add monit >/dev/null 2>&1 || :
+%triggerun -- monit < 5.3.1-1
+/usr/bin/systemd-sysv-convert --save monit > /dev/null 2>&1 || :
+/bin/systemctl --no-reload enable monit.service > /dev/null 2>&1 || :
+/sbin/chkconfig --del monit > /dev/null 2>&1 || :
+/bin/systemctl try-restart monit.server > /dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
-%doc CHANGES.txt COPYING LICENSE PLATFORMS README README.DEVELOPER README.SSL
+%doc CHANGES COPYING doc/PLATFORMS README
%config(noreplace) %{_sysconfdir}/monitrc
%config(noreplace) %{_sysconfdir}/monit.d/logging
%config(noreplace) %{_sysconfdir}/logrotate.d/monit
-%ghost %{_localstatedir}/log/monit.log
-/lib/systemd/system/monit.service
+%config %ghost %{_localstatedir}/log/monit.log
+%{_unitdir}/monit.service
%{_sysconfdir}/monit.d/
%{_bindir}/%{name}
%{_mandir}/man1/monit.1*
-%files sysvinit
-%{_initrddir}/monit
-
%changelog
* Wed Jul 20 2011 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.2.5-2
More information about the scm-commits
mailing list