[arch-commits] Commit in dcron/trunk (PKGBUILD dcron.conf.d dcron.rc.d)

[Paul Mattal]

    Date: Monday, February 22, 2010 @ 09:26:22
  Author: paul
Revision: 69752

added /etc/rc.conf/crond
cleaned up PKGBUILD

Added:
  dcron/trunk/dcron.conf.d
  dcron/trunk/dcron.rc.d
Modified:
  dcron/trunk/PKGBUILD

--------------+
 PKGBUILD     |   29 ++++++++++++++++++++++-------
 dcron.conf.d |    4 ++++
 dcron.rc.d   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-22 11:26:24 UTC (rev 69751)
+++ PKGBUILD	2010-02-22 14:26:22 UTC (rev 69752)
@@ -7,14 +7,18 @@
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.jimpryor.net/linux/dcron"
-backup=(var/spool/cron/root)
+backup=(var/spool/cron/root etc/conf.d/crond)
 depends=('glibc')
 provides=('cron')
 groups=('base')
 source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz"
-	'dcron-logname.patch')
+	'dcron-logname.patch'
+	'dcron.rc.d'
+	'dcron.conf.d')
 md5sums=('02d848ba043a9df5bf2102a9f4bc04bd'
-	 'c6054421b48100f7a2a7a36e2d33c92a')
+	 'c6054421b48100f7a2a7a36e2d33c92a'
+	 '73693cdd59df526e729cdec99c5ed8fb'
+	 '5bfa07beb54d0beaf3f38225e4d5a9fa')
 optdepends=('smtp-server: sending cron job output via email')
 
 build() {
@@ -24,11 +28,22 @@
 	patch -p1 -i $srcdir/dcron-logname.patch || return 1
 
 	# by default, any member of group "users" can edit their own crontab
-	make PREFIX=/usr CRONTAB_GROUP=users CRONTABS=/var/spool/cron CRONSTAMPS=/var/spool/cronstamps || return 1
+	make \
+		PREFIX=/usr \
+		CRONTAB_GROUP=users \
+		CRONTABS=/var/spool/cron \
+		CRONSTAMPS=/var/spool/cronstamps \
+		|| return 1
 	make DESTDIR="$pkgdir" install || return 1
 
-	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} || return 1
-	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond" || return 1
+	# install standard configuration and scripts
+	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} \
+		|| return 1
 	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" || return 1
-	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" || return 1
+	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" \
+		|| return 1
+
+	# install Arch configuration and launch scripts
+	install -D -m755 "$srcdir/dcron.rc.d" "$pkgdir/etc/rc.d/crond" || return 1
+	install -D -m0644 "$srcdir/dcron.conf.d" "$pkgdir/etc/conf.d/crond" || return 1
 }

Added: dcron.conf.d
===================================================================
--- dcron.conf.d	                        (rev 0)
+++ dcron.conf.d	2010-02-22 14:26:22 UTC (rev 69752)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to crond
+#
+CROND_ARGS="-S -l info"

Added: dcron.rc.d
===================================================================
--- dcron.rc.d	                        (rev 0)
+++ dcron.rc.d	2010-02-22 14:26:22 UTC (rev 69752)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/crond
+
+PID=$(pidof -o %PPID /usr/sbin/crond)
+case $1 in
+start)
+	stat_busy "Starting Cron Daemon"
+
+	# defaults to using syslog, and sendmail-ing cron output to local user
+	# to mail output to remote address instead, add "-m user at host"
+	# to CROND_ARGS in /etc/conf.d/crond
+	if [[ -z $PID ]] && /usr/sbin/crond $CROND_ARGS; then
+
+		PID=$(pidof -o %PPID /usr/sbin/crond)
+		echo "$PID" > /var/run/crond.pid
+		add_daemon crond
+		stat_done
+	else
+		stat_fail
+		exit 1
+	fi
+	;;
+
+stop)
+	stat_busy "Stopping Cron Daemon"
+	if [[ ! -z $PID ]]  && kill "$PID" &>/dev/null; then
+		rm_daemon crond
+		stat_done
+	else
+		stat_fail
+		exit 1
+	fi
+	;;
+
+restart)
+	$0 stop
+	$0 start
+	;;
+
+*)
+	echo "Usage: $0 {start|stop|restart}" >&2
+	exit 1
+
+esac