aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBBcan177 <bbcan177@gmail.com>2015-05-25 00:10:23 -0400
committerBBcan177 <bbcan177@gmail.com>2015-05-25 00:10:23 -0400
commit48d6105a64015ad0f547da90da150b030cbb26fd (patch)
tree630e022f8e307156aba53ac39b595e157fae5f11 /config
parent33ff3e6f91d8efadfafc1317640fc2d509d282c4 (diff)
downloadpfsense-packages-48d6105a64015ad0f547da90da150b030cbb26fd.tar.gz
pfsense-packages-48d6105a64015ad0f547da90da150b030cbb26fd.tar.bz2
pfsense-packages-48d6105a64015ad0f547da90da150b030cbb26fd.zip
pfBlockerNG v1.09 Maxmind Cron Task and addedit_string
The cron comparison function must skip the hour comparison for the Maxmind Cron task due to the hour being randomized (0-23). Add "addedit_string" to XML files. This will give description to the config backups.
Diffstat (limited to 'config')
-rw-r--r--config/pfblockerng/pfblockerng.inc6
-rw-r--r--config/pfblockerng/pfblockerng.php2
-rw-r--r--config/pfblockerng/pfblockerng.xml1
-rw-r--r--config/pfblockerng/pfblockerng_sync.xml1
-rw-r--r--config/pfblockerng/pfblockerng_top20.xml1
-rw-r--r--config/pfblockerng/pfblockerng_v4lists.xml1
-rw-r--r--config/pfblockerng/pfblockerng_v6lists.xml1
7 files changed, 12 insertions, 1 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index b67f681f..379ce223 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -263,6 +263,10 @@ function pfblockerng_cron_exists($crontask, $pfb_min, $pfb_hour) {
if ($item['minute'] != $pfb_min) {
return FALSE;
}
+ if ($pfb_hour == 'maxmind' && !empty($item['hour'])) {
+ // Maxmind hour is randomized. Skip comparison.
+ return TRUE;
+ }
if ($item['hour'] != $pfb_hour) {
return FALSE;
}
@@ -2662,7 +2666,7 @@ function sync_package_pfblockerng($cron = "") {
$pfb_gwho = "root";
// Determine if Cron Task requires updating
- if (!pfblockerng_cron_exists($pfb_gcmd, $pfb_gmin, $pfb_ghour)) {
+ if (!pfblockerng_cron_exists($pfb_gcmd, $pfb_gmin, 'maxmind')) {
install_cron_job($pfb_gcmd, true, $pfb_gmin, $pfb_ghour, $pfb_gmday, $pfb_gmonth, $pfb_gwday, $pfb_gwho);
}
}
diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php
index a3ff2105..f69983e2 100644
--- a/config/pfblockerng/pfblockerng.php
+++ b/config/pfblockerng/pfblockerng.php
@@ -668,6 +668,7 @@ $xml = <<<EOF
<version>1.0</version>
<title>pfBlockerNG: {$cont}</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save {$cont} settings</addedit_string>
<menu>
<name>pfBlockerNG: {$cont_name}</name>
<tooltiptext>Configure pfBlockerNG</tooltiptext>
@@ -1064,6 +1065,7 @@ $xmlrep = <<<EOF
<version>1.0</version>
<title>pfBlockerNG: IPv4 Reputation</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save Reputation Settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<tooltiptext>Configure pfblockerNG</tooltiptext>
diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml
index c8e07b21..218b22e1 100644
--- a/config/pfblockerng/pfblockerng.xml
+++ b/config/pfblockerng/pfblockerng.xml
@@ -52,6 +52,7 @@
<version>1.09</version>
<title>pfBlockerNG: General Settings</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save General Settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<configfile>pfblockerng.xml</configfile>
diff --git a/config/pfblockerng/pfblockerng_sync.xml b/config/pfblockerng/pfblockerng_sync.xml
index ace3d3b8..03b86dce 100644
--- a/config/pfblockerng/pfblockerng_sync.xml
+++ b/config/pfblockerng/pfblockerng_sync.xml
@@ -52,6 +52,7 @@
<version>1.0</version>
<title>pfBlockerNG: XMLRPC Sync</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save XMLRPC Sync settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<tooltiptext>Configure pfBlockerNG</tooltiptext>
diff --git a/config/pfblockerng/pfblockerng_top20.xml b/config/pfblockerng/pfblockerng_top20.xml
index 4a90ff8b..32ed52e8 100644
--- a/config/pfblockerng/pfblockerng_top20.xml
+++ b/config/pfblockerng/pfblockerng_top20.xml
@@ -52,6 +52,7 @@
<version>1.0</version>
<title>pfBlockerNG: Top 20 Spammer Countries</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save Top20 settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<tooltiptext>Configure pfblockerNG</tooltiptext>
diff --git a/config/pfblockerng/pfblockerng_v4lists.xml b/config/pfblockerng/pfblockerng_v4lists.xml
index b4c7e916..00747a24 100644
--- a/config/pfblockerng/pfblockerng_v4lists.xml
+++ b/config/pfblockerng/pfblockerng_v4lists.xml
@@ -54,6 +54,7 @@
<version>1.0</version>
<title>pfBlockerNG: IPv4 Alias/List Configuration</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save IPv4 settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<tooltiptext></tooltiptext>
diff --git a/config/pfblockerng/pfblockerng_v6lists.xml b/config/pfblockerng/pfblockerng_v6lists.xml
index 6c2b6480..3e9dbe6f 100644
--- a/config/pfblockerng/pfblockerng_v6lists.xml
+++ b/config/pfblockerng/pfblockerng_v6lists.xml
@@ -54,6 +54,7 @@
<version>1.0</version>
<title>pfBlockerNG: IPv6 Alias/List Configuration</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
+ <addedit_string>pfBlockerNG: Save IPv6 settings</addedit_string>
<menu>
<name>pfBlockerNG</name>
<tooltiptext></tooltiptext>