[leafnode] Fix cronjob. Fixes bug #728685

[Matej Cepl]

commit 1c0332a6f296753e39d59ae637146a5735601e90
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Nov 27 12:56:36 2012 +0100

    Fix cronjob. Fixes bug #728685

 leafnode.cron         |   12 ++++++------
 leafnode.cron.example |    6 ++++++
 leafnode.spec         |   34 ++++++++++++++++++++++------------
 3 files changed, 34 insertions(+), 18 deletions(-)
---
diff --git a/leafnode.cron b/leafnode.cron
old mode 100644
new mode 100755
index eeefdae..0ee511e
--- a/leafnode.cron
+++ b/leafnode.cron
@@ -1,6 +1,6 @@
-# This is an example cron file for leafnode.
-# Adjust to your needs after leafnode is configured and uncomment.
-#
-# This job will fetch news from your sources every hour. 
-#
-#01 * * * * root /usr/sbin/fetchnews
+#!/bin/sh
+set -eu
+
+if nm-online -t 5 -x -q ; then
+    su news -s /bin/sh -c /usr/sbin/fetchnews
+fi
diff --git a/leafnode.cron.example b/leafnode.cron.example
new file mode 100644
index 0000000..eeefdae
--- /dev/null
+++ b/leafnode.cron.example
@@ -0,0 +1,6 @@
+# This is an example cron file for leafnode.
+# Adjust to your needs after leafnode is configured and uncomment.
+#
+# This job will fetch news from your sources every hour. 
+#
+#01 * * * * root /usr/sbin/fetchnews
diff --git a/leafnode.spec b/leafnode.spec
index b036156..f926331 100644
--- a/leafnode.spec
+++ b/leafnode.spec
@@ -1,6 +1,6 @@
 Name: leafnode
 Version: 1.11.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 Summary: Leaf site offline NNTP server
 License: MIT and LGPLv2
@@ -10,10 +10,12 @@ Source0: http://download.sourceforge.net/leafnode/leafnode-%{version}.tar.bz2
 Source2: leafnode.cron
 Source3: leafnode.socket
 Source4: leafnode at .service
+Source5: leafnode.cron.example
 
 Patch1: leafnode-1.11.8-nonettests.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcre-devel
+Requires: NetworkManager
 Requires(pre): shadow-utils
 BuildRequires: systemd-units
 Requires(post): grep
@@ -42,6 +44,8 @@ regelmäßig lesen, vom Newsserver des Providers.
 %setup -q -n %{name}-%{version}
 %patch1 -p1
 
+cp -p %{SOURCE5} .
+
 %build
 %configure --with-spooldir=%spooldir --sysconfdir=%confdir --with-lockfile=%lockfile --with-ipv6
 
@@ -58,11 +62,14 @@ for i in $RPM_BUILD_ROOT/%{_sysconfdir}/leafnode/*.example ; do
 done
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/leafnode/*.example
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
-install -m755 leafnode.cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/leafnode
+install -m755 leafnode.cron.daily \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/leafnode
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d
-install -m644 leafnode.xinetd  $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/leafnode
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/leafnode
+install -m644 leafnode.xinetd \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/leafnode
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly
+install -m644 %{SOURCE2} \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/leafnode
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/leafnode/Makefile.dist
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/leafnode/nntp.rules.dist
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/leafnode/run.tcpd.dist
@@ -123,7 +130,7 @@ fi
 %config(noreplace) %attr(640,root,news) %confdir/filters
 %config(noreplace) %{_sysconfdir}/cron.daily/leafnode
 %config(noreplace) %{_sysconfdir}/xinetd.d/leafnode
-%config(noreplace) %{_sysconfdir}/cron.d/leafnode
+%config(noreplace) %{_sysconfdir}/cron.hourly/leafnode
 %{_bindir}/*
 %{_sbindir}/*
 
@@ -131,7 +138,7 @@ fi
 %doc %_mandir/man8/*
 
 %doc COPYING COPYING.GPL COPYING.LGPL CREDITS ChangeLog ChangeLog.old
-%doc FAQ.* INSTALL
+%doc FAQ.* INSTALL leafnode.cron.example
 %doc NEWS README* ADD-ONS
 %lang(de) %doc _doc_german/doc_german
 
@@ -149,6 +156,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Nov 27 2012 Matěj Cepl <mcepl at redhat.com> - 1.11.8-9
+- Fix cronjob. Fixes bug #728685
+
 * Sat Aug 25 2012 Kevin Fenzi <kevin at scrye.com> 1.11.8-8
 - Add systemd macros for presets. Fixes bug #850182
 
@@ -168,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Thu Aug 05 2010 Kevin Fenzi <kevin at tummy.com> - 1.11.8-2
-- Add patch to avoid network tests during build. 
+- Add patch to avoid network tests during build.
 
 * Thu Aug 05 2010 Kevin Fenzi <kevin at tummy.com> - 1.11.8-1
 - Update to 1.11.8
@@ -196,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuild for gcc43
 
 * Sat Aug 25 2007 Kevin Fenzi <kevin at tummy.com> - 1.11.6-2
-- License tag update. 
+- License tag update.
 
 * Sat Mar 17 2007 Kevin Fenzi <kevin at tummy.com> - 1.11.6-1
 - Upgrade to 1.11.6
@@ -214,10 +224,10 @@ rm -rf $RPM_BUILD_ROOT
 - Take over maintainership (see bug 185883)
 - Update to 1.11.5-1
 - Add dist tag
-- Remove some doc files that are no longer shipped. 
-- Add check section. 
+- Remove some doc files that are no longer shipped.
+- Add check section.
 - Fix spec file encoding
-- Fix macros in changelog. 
+- Fix macros in changelog.
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.9.53-3
 - rebuild on all arches