[leafnode] Convert to systemd from xinetd. Fixes bug #737676
Kevin Fenzi
kevin at fedoraproject.org
Sun Jan 29 06:13:14 UTC 2012
commit 7fec83cddc1b9270861532d2d00394348d887d78
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sat Jan 28 23:13:11 2012 -0700
Convert to systemd from xinetd. Fixes bug #737676
leafnode.socket | 9 +++++++++
leafnode.spec | 41 ++++++++++++++++++++++++++++++++++++++---
leafnode at .service | 7 +++++++
3 files changed, 54 insertions(+), 3 deletions(-)
---
diff --git a/leafnode.socket b/leafnode.socket
new file mode 100644
index 0000000..3e3210e
--- /dev/null
+++ b/leafnode.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Leafnode NNTP server
+
+[Socket]
+ListenStream=119
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/leafnode.spec b/leafnode.spec
index ab44155..7438bc4 100644
--- a/leafnode.spec
+++ b/leafnode.spec
@@ -1,6 +1,6 @@
Name: leafnode
Version: 1.11.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Leaf site offline NNTP server
License: MIT and LGPLv2
@@ -8,11 +8,18 @@ Group: Applications/Internet
URL: http://www.leafnode.org
Source0: http://download.sourceforge.net/leafnode/leafnode-%{version}.tar.bz2
Source2: leafnode.cron
+Source3: leafnode.socket
+Source4: leafnode at .service
+
Patch1: leafnode-1.11.8-nonettests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre-devel
-Requires: xinetd
Requires(pre): shadow-utils
+BuildRequires: systemd-units
+Requires(post): grep
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%define confdir %{_sysconfdir}/leafnode
%define spooldir %{_localstatedir}/spool/news
@@ -66,6 +73,10 @@ rm -rf _doc_german ; mkdir _doc_german
cp -a doc_german _doc_german
rm -f _doc_german/doc_german/Makefile* _doc_german/doc_german/*.in
+install -d -m 755 %{buildroot}%{_unitdir}
+install -p -m 755 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.socket
+install -p -m 755 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}@.service
+
%pre
getent group news >/dev/null || groupadd -r news
getent passwd news >/dev/null || \
@@ -73,6 +84,26 @@ useradd -r -g news -d /etc/news -s /sbin/nologin \
-c "News server user" news
exit 0
+%post
+if [ $1 -eq 1 ]; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable leafnode at .service > /dev/null 2>&1 || :
+ /bin/systemctl stop leafnode at .service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart leafnode at .service >/dev/null 2>&1 || :
+fi
+
%files
%defattr(-,root,root)
%attr(750,root,news) %dir %confdir/
@@ -99,12 +130,16 @@ exit 0
%dir %attr(755,news,news) %spooldir/out.going
%dir %attr(755,news,news) %spooldir/temp.files
%dir %attr(755,news,news) %spooldir/message.id
-
+%{_unitdir}/%{name}@.service
+%{_unitdir}/%{name}.socket
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 28 2012 Kevin Fenzi <kevin at scrye.com> 1.11.8-5
+- Convert to systemd from xinetd. Fixes bug #737676
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/leafnode at .service b/leafnode at .service
new file mode 100644
index 0000000..590f5be
--- /dev/null
+++ b/leafnode at .service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Leafnode NNTP server
+After=local-fs.target
+
+[Service]
+ExecStart=/usr/sbin/leafnode
+StandardInput=socket
More information about the scm-commits
mailing list