[clamsmtp] systemd unit conversion
Nathanael Noblet
gnat at fedoraproject.org
Thu Jan 5 19:22:24 UTC 2012
commit 0c1bcc1955163ac7f1c0486c985fd21c0afa4021
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date: Thu Jan 5 12:22:18 2012 -0700
systemd unit conversion
clamsmtp-clamd.conf | 2 +-
clamsmtp-clamd.init | 7 ----
clamsmtp-clamd.service | 11 ++++++
clamsmtp-clamd.sysconfig | 3 --
clamsmtp.init | 75 -----------------------------------------
clamsmtp.spec | 84 +++++++++++++++++++++++++++++-----------------
clamsmtpd.conf | 2 +-
clamsmtpd.service | 11 ++++++
clamsmtpd.sysconf | 3 --
9 files changed, 77 insertions(+), 121 deletions(-)
---
diff --git a/clamsmtp-clamd.conf b/clamsmtp-clamd.conf
index a7ed946..d8eec33 100644
--- a/clamsmtp-clamd.conf
+++ b/clamsmtp-clamd.conf
@@ -69,7 +69,7 @@ TemporaryDirectory /var/lib/clamd.clamsmtp
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-LocalSocket /var/run/clamd.clamsmtp/clamd.sock
+LocalSocket /run/clamd.clamsmtp/socket
# Remove stale socket after unclean shutdown.
# Default: yes
diff --git a/clamsmtp-clamd.service b/clamsmtp-clamd.service
new file mode 100644
index 0000000..285030e
--- /dev/null
+++ b/clamsmtp-clamd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Clamd SMTP An Interface Between MTA And Content Checkers
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/clamd.clamsmtp/clamd.pid
+ExecStart=/usr/sbin/clamd -c /etc/clamd.d/clamsmtp.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/clamsmtp.spec b/clamsmtp.spec
index 5d9cf48..36be2b3 100644
--- a/clamsmtp.spec
+++ b/clamsmtp.spec
@@ -1,16 +1,14 @@
Summary: A SMTP virus scanning system
Name: clamsmtp
Version: 1.10
-Release: 5%{?dist}
+Release: 6%{?dist}
License: BSD
Group: System Environment/Daemons
Source0: http://memberwebs.com/stef/software/clamsmtp/clamsmtp-%{version}.tar.gz
-Source1: clamsmtp.init
+Source1: clamsmtpd.service
Source2: clamsmtpd.conf
-Source3: clamsmtpd.sysconf
-Source4: clamsmtp-clamd.sysconfig
Source5: clamsmtp-clamd.logrotate
-Source6: clamsmtp-clamd.init
+Source6: clamsmtp-clamd.service
Source7: clamsmtp-clamd.conf
Source8: clamsmtp-tmpfile.conf
@@ -20,11 +18,16 @@ URL: http://memberwebs.com/stef/software/clamsmtp/
# kept to be able to build EPEL versions
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: clamav-devel
+BuildRequires: systemd-units
Requires(pre): shadow-utils
-Requires(postun): initscripts
-Requires(post): chkconfig
+Requires(post): systemd-sysv
+
Requires(preun): chkconfig
+Requires(post): chkconfig
+
+Requires(postun): initscripts
Requires(preun): initscripts
+
Requires: clamav-server
%description
@@ -62,62 +65,81 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_var}/run/clamd.clamsmtp
mkdir -p $RPM_BUILD_ROOT%{_var}/log/clamd.clamsmtp
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/clamd.clamsmtp
-install -Dp -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamsmtpd
+install -Dp -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/clamsmtpd.service
install -Dp -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/clamsmtpd.conf
-install -Dp -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamsmtpd
-install -Dp -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.clamsmtp
install -Dp -m0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/clamsmtp
-install -Dp -m0755 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/clamsmtp-clamd
+
+install -Dp -m0644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/clamsmtp-clamd.service
install -Dp -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/clamsmtp.conf
+
install -Dp -m0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/clamsmtp.conf
-ln -sf clamd $RPM_BUILD_ROOT%{_sbindir}/clamd.clamsmtp
+#ln -sf clamd $RPM_BUILD_ROOT%{_sbindir}/clamd.clamsmtp
%clean
rm -rf $RPM_BUILD_ROOT
+%triggerun -- clamsmtpd < 1.10-6
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save clamsmtpd >/dev/null 2>&1 ||:
+/usr/bin/systemd-sysv-convert --save clamsmtpd-clamd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del clamsmtpd >/dev/null 2>&1 || :
+/bin/systemctl try-restart clamsmtpd.service >/dev/null 2>&1 || :
+
+/sbin/chkconfig --del clamsmtpd-clamd >/dev/null 2>&1 || :
+/bin/systemctl try-restart clamsmtpd-clamd.service >/dev/null 2>&1 || :
+
%post
-/sbin/chkconfig --add clamsmtpd
-/sbin/chkconfig --add clamsmtp-clamd
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
%preun
-if [ $1 -eq 0 ];
-then
- /sbin/service clamsmtpd stop &>/dev/null || :
- /sbin/chkconfig --del clamsmtpd
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable clamsmtpd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop clamsmtpd.service > /dev/null 2>&1 || :
+
+ /bin/systemctl --no-reload disable clamsmtpd-clamd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop clamsmtpd-clamd.service > /dev/null 2>&1 || :
+fi
- /sbin/service clamsmtp-clamd stop &>/dev/null || :
- /sbin/chkconfig --del clamsmtp-clamd
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart clamsmtpd.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart clamsmtpd-clamd.service >/dev/null 2>&1 || :
fi
%pre
getent passwd clamsmtp >/dev/null || useradd -r -g mail -d %{_var}/lib/clamd.clamsmtp -s /sbin/nologin -c 'User to own clamsmtp directories and default processes' clamsmtp
exit 0
-%postun
-if [ $1 -ge 1 ]; then
- /sbin/service clamsmtpd condrestart &>/dev/null || :
-fi
-
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README
-%{_initrddir}/clamsmtpd
-%{_initrddir}/clamsmtp-clamd
+%{_unitdir}/clamsmtpd.service
+%{_unitdir}/clamsmtp-clamd.service
%config(noreplace) %{_sysconfdir}/logrotate.d/clamsmtp
%config(noreplace) %{_sysconfdir}/clamsmtpd.conf
%config(noreplace) %{_sysconfdir}/clamd.d/clamsmtp.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/clamsmtpd
-%config(noreplace) %{_sysconfdir}/sysconfig/clamd.clamsmtp
%config(noreplace) %{_sysconfdir}/tmpfiles.d/clamsmtp.conf
%attr(755,root,root) %{_sbindir}/clamsmtpd
-%attr(755,root,root) %{_sbindir}/clamd.clamsmtp
%attr(755,clamsmtp,mail) %{_var}/lib/clamd.clamsmtp
%attr(755,clamsmtp,mail) %{_var}/log/clamd.clamsmtp
-%attr(755,clamsmtp,mail) %{_var}/run/clamd.clamsmtp
%{_mandir}/man5/clamsmtpd.conf.5.gz
%{_mandir}/man8/clamsmtpd.8.gz
%changelog
+* Thu Jan 5 2012 Nathanael Noblet <nathanael at gnat.ca> - 1.10-6
+- Added native systemd files provided by Johann
+- Removed /var/run/clamd.clamsmtp
+
* Mon Nov 21 2011 Nathanael Noblet <nathanael at gnat.ca> - 1.10-5
- Fix log rotation
diff --git a/clamsmtpd.conf b/clamsmtpd.conf
index 65d4b8a..1814630 100644
--- a/clamsmtpd.conf
+++ b/clamsmtpd.conf
@@ -22,7 +22,7 @@ OutAddress: 10026
#Listen: 0.0.0.0:10025
# The address clamd is listening on
-ClamAddress: /var/run/clamd.clamsmtp/clamd.sock
+ClamAddress: /run/clamd.clamsmtp/socket
# A header to add to all scanned email
#Header: X-Virus-Scanned: ClamAV using ClamSMTP
diff --git a/clamsmtpd.service b/clamsmtpd.service
new file mode 100644
index 0000000..1611649
--- /dev/null
+++ b/clamsmtpd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Clamav Smtpd Antivirus Daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/clamsmtp/clamsmtpd.pid
+ExecStart=/usr/sbin/clamsmtpd -f /etc/clamsmtpd.conf -p /run/clamsmtp/clamsmtpd.pid
+
+[Install]
+WantedBy=multi-user.target
More information about the scm-commits
mailing list