[inn] Add Condition to /etc/news/inn.conf in innd.service

Jochen Schmitt s4504kr at fedoraproject.org
Wed Jul 13 15:52:58 UTC 2011


commit d9ed55cb73a3b248fee333113fdde2e35cae6fd6
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Jul 13 17:52:47 2011 +0200

    Add Condition to /etc/news/inn.conf in innd.service

 inn.spec     |    7 +++++--
 innd.service |    3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/inn.spec b/inn.spec
index 8ddf560..256fa65 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -282,7 +282,7 @@ fi
 %preun
 if [ $1 = 0 ]; then
     /bin/systemctl disable innd.service >/dev/null 2>&1 || :
-    /bin/systemctl stop innd.service >/dev/null 2>&1 || :
+    /bin/systemctl --no-reload stop innd.service >/dev/null 2>&1 || :
     if [ -f /var/lib/news/history.dir ]; then
        rm -f /var/lib/news/history.*
     fi
@@ -528,6 +528,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jul 13 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.2-11
+- Add Condition to /etc/news/inn.conf in innd.service
+
 * Tue Jul  5 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.2-10
 - Fix typo in start-inn
 
diff --git a/innd.service b/innd.service
index 2bb0594..41341f7 100644
--- a/innd.service
+++ b/innd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Inetnet News Daemon
 After=syslog.target network.target
+ConditionPathExists=/etc/news/inn.conf
 
 [Service]
 PIDFile=/run/news/innd.pid
@@ -9,8 +10,6 @@ ExecStartPre=/lib/systemd/prepare-innd
 ExecStart=/lib/systemd/start-innd
 ExecStop=/lib/systemd/stop-innd
 KillMode=control-group
-StandardOutput=syslog
-StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file


More information about the scm-commits mailing list