From bf3b75c7cf7d3fed6e76020903c463cdc1660d90 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 28 Mar 2016 17:18:00 +0000
Subject: rpkigui-check-expired needs to run as user rpki.  Clean up rpki-ca
 cron job stuff while we're at this.

svn path=/branches/tk705/; revision=6334
---
 buildtools/debian-skeleton/rpki-ca.postinst | 10 +++++-----
 buildtools/debian-skeleton/rpki-ca.prerm    |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst
index 3dcecd1b..0bc8f9cc 100644
--- a/buildtools/debian-skeleton/rpki-ca.postinst
+++ b/buildtools/debian-skeleton/rpki-ca.postinst
@@ -40,11 +40,11 @@ setup_bpki() {
 }
 
 setup_cron() {
-    t=$(hexdump -n 1 -e '"%u"' /dev/urandom) && echo "$(($t % 60)) */2 * * * nobody /usr/lib/rpki/rpkigui-import-routes" > /etc/cron.d/rpkigui-routeviews
-    chmod 644 /etc/cron.d/rpkigui-routeviews
-    ln -sf /usr/lib/rpki/rpkigui-check-expired /etc/cron.daily/rpkigui-check-expired
-    echo "30 3 * * * rpki /usr/sbin/rpkic update_bpki" >/etc/cron.d/rpki-update-bpki
-    chmod 644 /etc/cron.d/rpki-update-bpki
+    t=$(( $(hexdump -n 1 -e '"%u"' /dev/urandom) % 60 )) || exit
+    echo "$t */2 * * *	nobody	/usr/lib/rpki/rpkigui-import-routes"	> /etc/cron.d/rpkigui-routeviews
+    echo "@daily	rpki	/usr/lib/rpki/rpkigui-check-expired"	> /etc/cron.d/rpkigui-check-expired
+    echo "30 3 * * *	rpki	/usr/sbin/rpkic update_bpki"		> /etc/cron.d/rpki-update-bpki
+    chmod 644 /etc/cron.d/rpkigui-routeviews /etc/cron.d/rpkigui-check-expired /etc/cron.d/rpki-update-bpki
 }
 
 # summary of how this script can be called:
diff --git a/buildtools/debian-skeleton/rpki-ca.prerm b/buildtools/debian-skeleton/rpki-ca.prerm
index 08216a20..c341502b 100644
--- a/buildtools/debian-skeleton/rpki-ca.prerm
+++ b/buildtools/debian-skeleton/rpki-ca.prerm
@@ -28,9 +28,11 @@ case "$1" in
 	# Clean up our cron jobs.
 
 	rm -f /etc/cron.d/rpkigui-routeviews
-	rm -f /etc/cron.daily/rpkigui-check-expired
+	rm -f /etc/cron.d/rpkigui-check-expired
 	rm -f /etc/cron.d/rpki-update-bpki
 
+	rm -f /etc/cron.daily/rpkigui-check-expired
+
 	# Clean up what we did to Apache.
 
 	/usr/lib/rpki/rpkigui-apache-conf-gen --remove --verbose
-- 
cgit v1.2.3