[rpms/inn] epel10: Rework ystemd timer handling (#1046960)

[rpms/inn] epel10: Rework ystemd timer handling (#1046960)

[Jochen Schmitt]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : 697f4e5d1112d62dea25aca0731dfa0969826507
Author : Jochen Schmitt <Jochen@herr-schmitt.de>
Date   : 2014-01-02T16:54:22+01:00
Stats  : +22/-26 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/697f4e5d1112d62dea25aca0731dfa0969826507?branch=epel10

Log:
Rework ystemd timer handling (#1046960)

---
diff --git a/inn.spec b/inn.spec
index 8362891..2dd52fc 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -235,9 +235,6 @@ touch /var/log/news/news.err
 chown -R news:news /var/log/news*
 
 %systemd_post innd.service
-systemctl enable innd-expire.service >/dev/null
-systemctl enable innd-nntpsend.service >/dev/null
-systemctl enable innd-rnews.service >/dev/null
 
 systemctl enable innd-expire.timer >/dev/null
 systemctl enable innd-nntpsend.timer >/dev/null
@@ -247,10 +244,6 @@ systemctl start innd-expire.timer
 systemctl start innd-nntpsend.timer
 systemctl start innd-rnews.timer
 
-systemctl start innd-expire.service
-systemctl start innd-nntpsend.service
-systemctl start innd-rnews.service
-
 %post libs -p /sbin/ldconfig
 
 %triggerin -- rsyslog
@@ -306,10 +299,6 @@ fi
 %systemd_preun innd-nntpsend.timer
 %systemd_preun innd-rnews.timer
 
-%systemd_preun innd-expire.service
-%systemd_preun innd-nntpsend.service
-%systemd_preun innd-rnews.service
-
 %systemd_preun innd.service
 
 if [ $1 = 0 ]; then
@@ -319,6 +308,16 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
+
+# Stop/disable misconfigured timer/service untis
+systemctl stop innd-expire.service
+systemctl stop innd-nntpsend.service
+systemctl stop innd-rnews.service
+
+systemctl disable innd-expire.service
+systemctl disable innd-nntpsend.service
+systemctl disable innd-rnews.service
+
 %systemd_postun_with_restart innd.service
 
 %postun libs -p /sbin/ldconfig
@@ -565,6 +564,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Sun Dec 29 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-15
+- Rework ystemd timer handling (#1046960)
+
 * Sat Dec 14 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-14
 - Fix typo in innd-nntpsend.service (#1043126)
 

diff --git a/innd-expire.service b/innd-expire.service
index 8aa9cbd..5fb0965 100755
--- a/innd-expire.service
+++ b/innd-expire.service
@@ -1,13 +1,10 @@
 [Unit]
 Description=Inetnet News Daemon Expiring
-After=syslog.target network.target innd.service
+After=network.target innd.service
 ConditionPathExists=/etc/news/inn.conf
 
 [Service]
 User=news
 PermissionsStartOnly=true
-Type=oneshot
+Type=simple
 ExecStart=/usr/libexec/news/news.daily delayrm
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-expire.timer b/innd-expire.timer
index 06922f3..83a0bc5 100644
--- a/innd-expire.timer
+++ b/innd-expire.timer
@@ -3,6 +3,7 @@ Description=Inetnet News Daemon Exp
 
 [Timer]
 OnUnitActiveSec=1d
+Unit=innd-expire.service
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-muser.target
\ No newline at end of file

diff --git a/innd-nntpsend.service b/innd-nntpsend.service
index 5ab1999..cb31b20 100644
--- a/innd-nntpsend.service
+++ b/innd-nntpsend.service
@@ -7,8 +7,5 @@ ConditionPathExists=/run/news/inn.pid
 [Service]
 User=news
 PermissionsStartOnly=true
-Type=oneshot
+Type=simple
 ExecStart=/usr/libexec/news/nntpsend
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-nntpsend.timer b/innd-nntpsend.timer
index f6c6b15..05747ba 100644
--- a/innd-nntpsend.timer
+++ b/innd-nntpsend.timer
@@ -5,6 +5,7 @@ ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
 OnUnitActiveSec=1h
+Unit=innd-nntpsend.service
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-rnews.service b/innd-rnews.service
index fd7051b..5126d60 100644
--- a/innd-rnews.service
+++ b/innd-rnews.service
@@ -6,8 +6,5 @@ ConditionPathExists=/etc/news/inn.conf
 [Service]
 User=news
 PermissionsStartOnly=true
-Type=oneshot
+Type=simple
 ExecStart=/usr/libexec/news/rnews -U
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-rnews.timer b/innd-rnews.timer
index e44f0a1..7c80344 100644
--- a/innd-rnews.timer
+++ b/innd-rnews.timer
@@ -5,6 +5,7 @@ ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
 OnUnitActiveSec=1h
+Unit=innd-rnews.service
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file