From ae7f0008354fa3fd2d56e67e12b425eb08a7175a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 6 Jun 2016 07:14:04 +0200
Subject: [PATCH] cron: migrate away from minicron usage

---
 Makefile                 |  1 -
 src/etc/inc/services.inc | 18 +++++++++++++-----
 src/etc/rc               |  9 ---------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 6745d586e..105b9fa48 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,6 @@ CORE_DEPENDS?=		apinger \
 			isc-dhcp43-relay \
 			isc-dhcp43-server \
 			lighttpd \
-			minicron \
 			miniupnpd \
 			mpd5 \
 			ngattach \
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index ecf8456d5..1edadf160 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2371,11 +2371,19 @@ function configure_cron()
 
     $autocron = array();
 
-    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout', '*/60');
-    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 sshlockout', '*/60');
-    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 virusprot', '*/60');
-    $autocron[] = generate_cron_job('/usr/local/etc/rc.update_urltables', '30', '12');
-    $autocron[] = generate_cron_job('/usr/local/etc/rc.dyndns.update', '1', '1');
+    /* hourly */
+    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 webConfiguratorlockout', '1');
+    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 sshlockout', '2');
+    $autocron[] = generate_cron_job('/usr/local/sbin/expiretable -v -t 3600 virusprot', '3');
+    $autocron[] = generate_cron_job('/usr/local/etc/rc.expireaccounts', '5');
+
+    /* daily */
+    $autocron[] = generate_cron_job('/usr/local/etc/rc.update_alias_url_data', '1', '1');
+    $autocron[] = generate_cron_job('/usr/local/etc/rc.update_urltables', '5', '1');
+    $autocron[] = generate_cron_job('/usr/local/etc/rc.dyndns.update', '11', '1');
+
+    /* every now and then */
+    $autocron[] = generate_cron_job('/usr/local/sbin/ping_hosts.sh', '*/4');
 
     if (!empty($config['system']['rrdbackup'])) {
        $autocron[] = generate_cron_job('/usr/local/etc/rc.backup_rrd', '0', '*/' . $config['system']['rrdbackup']);
diff --git a/src/etc/rc b/src/etc/rc
index 21e9c1a06..d88319d7c 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -250,15 +250,6 @@ echo "done."
 # starting standard rc scripts
 /usr/local/etc/rc.opnsense start
 
-# Start ping handler every 240 seconds
-/usr/local/bin/minicron 240 /var/run/ping_hosts.pid /usr/local/sbin/ping_hosts.sh
-
-# Start account expire handler every hour
-/usr/local/bin/minicron 3600 /var/run/expire_accounts.pid /usr/local/etc/rc.expireaccounts
-
-# Start alias url updater every 24 hours
-/usr/local/bin/minicron 86400 /var/run/update_alias_url_data.pid /usr/local/etc/rc.update_alias_url_data
-
 /usr/local/sbin/beep.sh start
 
 /usr/local/etc/rc.initial.banner