From 8c9be5cab8c826178015db0a3be2fd9db4c684a7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 25 Apr 2016 18:03:19 +0200
Subject: [PATCH] cron: the bogon job; #911

---
 src/etc/inc/services.inc             | 17 ++++++++++++++++-
 src/www/system_advanced_firewall.php | 12 ------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 19356fc45..6f98530f0 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2349,12 +2349,13 @@ function configure_cron()
         '/usr/local/etc/rc.backup_dhcpleases',
         '/usr/local/etc/rc.backup_netflow',
         '/usr/local/etc/rc.backup_rrd',
+        '/usr/local/etc/rc.update_bogons',
     );
 
     foreach ($obsoletes as $obsolete) {
        /*
         * Strip old cron jobs that we no longer save explicitly.
-        * This can be savely removed on our final road to 17.1.
+        * This can be safely removed on our final road to 17.1.
         */
        install_cron_job($obsolete, false);
     }
@@ -2373,6 +2374,20 @@ function configure_cron()
         $autocron[] = generate_cron_job('/usr/local/etc/rc.backup_netflow', $minute = '0', '*/' . $config['system']['netflowbackup']);
     }
 
+    /* bogons fetch always set in default config.xml */
+    switch ($config['system']['bogons']['interval']) {
+        case 'daily':
+            install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "*", "*", "*");
+            break;
+        case 'weekly':
+            install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "*", "*", "0");
+            break;
+        case 'monthly':
+        default:
+            install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "1", "*", "*");
+            break;
+    }
+
     $anchor = '# custom crontab entries';
 
     /* preserve existing crontab entries */
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index 9bc4e9006..2931e8ba5 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -214,18 +214,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         }
 
         if ($pconfig['bogonsinterval'] != $config['system']['bogons']['interval']) {
-            switch ($pconfig['bogonsinterval']) {
-                case 'daily':
-                    install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "*", "*", "*");
-                    break;
-                case 'weekly':
-                    install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "*", "*", "0");
-                    break;
-                case 'monthly':
-                default:
-                    install_cron_job("/usr/local/etc/rc.update_bogons", true, "1", "3", "1", "*", "*");
-                    break;
-            }
             $config['system']['bogons']['interval'] = $pconfig['bogonsinterval'];
         }