[dircproxy] Convert to systemd. Fixes bug #772089

Kevin Fenzi kevin at fedoraproject.org
Sun Jan 29 06:34:41 UTC 2012


commit c2daedd7d859795b8f833aaa5b8dd001751fa192
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Jan 28 23:34:38 2012 -0700

    Convert to systemd. Fixes bug #772089

 dircproxy.service |   11 +++++++++++
 dircproxy.spec    |   29 ++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/dircproxy.service b/dircproxy.service
new file mode 100644
index 0000000..42b2fef
--- /dev/null
+++ b/dircproxy.service
@@ -0,0 +1,11 @@
+[Unit]
+Description= Dircproxy IRC Proxy Server
+After=network.target
+
+[Service]
+User=dircproxy
+Type=forking
+ExecStart=/usr/bin/dircproxy -f /etc/dircproxyrc
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dircproxy.spec b/dircproxy.spec
index 10e96d5..8a57338 100644
--- a/dircproxy.spec
+++ b/dircproxy.spec
@@ -1,7 +1,7 @@
 Name:           dircproxy
 Version:        1.2.0
 %define betaver RC1
-Release:        0.13.%{betaver}%{?dist}
+Release:        0.14.%{betaver}%{?dist}
 Summary:        IRC proxy server
 
 Group:          Applications/Internet
@@ -10,9 +10,15 @@ URL:            http://code.google.com/p/dircproxy/
 Source0:        http://dircproxy.googlecode.com/files/%{name}-%{version}-%{betaver}.tar.gz
 Source1:        dircproxy.init
 Source2:        dircproxy.sysconfig
+Source3:        dircproxy.service
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
+BuildRequires: systemd-units
+Requires(post): grep
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 %description
 dircproxy is an IRC proxy server ("bouncer") designed for people
@@ -42,6 +48,9 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/dircproxy
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dircproxy
 chmod +x $RPM_BUILD_ROOT%{_datadir}/dircproxy/*.{sh,pl}
 
+install -d -m 755 %{buildroot}%{_unitdir}
+install -p -m 755 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -52,16 +61,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add dircproxy
+if [ $1 -eq 1 ]; then
+    # Initial installation
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
 if [ "$1" = 0 ]; then
+  # Package removal, not upgrade
   /sbin/service dircproxy stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del dircproxy
+  /bin/systemctl --no-reload disable dircproxy.service > /dev/null 2>&1 || :
+  /bin/systemctl stop dircproxy.service > /dev/null 2>&1 || :
 fi
 
 %postun
-if [ "$1" -ge 1 ]; then
-  /sbin/service dircproxy condrestart >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart dircproxy.service >/dev/null 2>&1 || :
+    /sbin/service dircproxy condrestart >/dev/null 2>&1 || :
 fi
 
 %files
@@ -75,8 +94,12 @@ fi
 %{_mandir}/man?/*
 %{_bindir}/*
 %{_datadir}/dircproxy/
+%{_unitdir}/%{name}.service
 
 %changelog
+* Sat Jan 28 2012 Kevin Fenzi <kevin at scrye.com> 1.2.0-0.14.RC1
+- Convert to systemd. Fixes bug #772089
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-0.13.RC1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list