aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/cron/cron.php3
-rw-r--r--config/cron/cron.xml2
-rw-r--r--config/cron/cron_edit.php66
-rw-r--r--config/haproxy-devel/haproxy.xml2
-rw-r--r--config/haproxy-devel/pkg/haproxy.inc9
-rw-r--r--config/haproxy-devel/pkg/haproxy_socketinfo.inc6
-rw-r--r--config/haproxy-devel/www/haproxy_global.php29
-rw-r--r--config/haproxy-devel/www/haproxy_listeners_edit.php16
-rw-r--r--config/haproxy-devel/www/haproxy_pool_edit.php13
-rw-r--r--config/pfblockerng/pfblockerng.inc19
-rw-r--r--config/pfblockerng/pfblockerng.php6
-rw-r--r--config/pfblockerng/pfblockerng.xml2
-rw-r--r--config/pfblockerng/pfblockerng_install.inc9
-rw-r--r--config/pfblockerng/pfblockerng_top20.xml3
-rw-r--r--config/sarg/sarg.inc4
-rw-r--r--pkg_config.10.xml9
-rw-r--r--pkg_config.8.xml6
-rw-r--r--pkg_config.8.xml.amd646
18 files changed, 136 insertions, 74 deletions
diff --git a/config/cron/cron.php b/config/cron/cron.php
index 7d55b086..ec15a4cb 100644
--- a/config/cron/cron.php
+++ b/config/cron/cron.php
@@ -76,7 +76,8 @@ include("head.inc");
<tr><td>
<div>
Cron controls the scheduling of commands.<br /><br />
- For more information see: <a href='http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html'>http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html</a>
+ For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+ and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
</div>
</td></tr>
</table>
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 181a4506..5e596b6b 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>cronsettings</name>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<title>Cron Settings</title>
<include_file>/usr/local/pkg/cron.inc</include_file>
<menu>
diff --git a/config/cron/cron_edit.php b/config/cron/cron_edit.php
index b89c28e0..58389284 100644
--- a/config/cron/cron_edit.php
+++ b/config/cron/cron_edit.php
@@ -128,45 +128,57 @@ function show_advanced_config() {
<form action="cron_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="form">
<tr>
- <td width="25%" valign="top" class="vncellreq">minute</td>
- <td width="75%" class="vtable">
- <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Minute</td>
+ <td width="90%" class="vtable">
+ <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" /><br/>
+ The minute(s) at which the command will be executed.<br/>
+ (0-59, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">hour</td>
- <td width="75%" class="vtable">
- <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Hour</td>
+ <td width="90%" class="vtable">
+ <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" /><br/>
+ The day(s) of the month on which the command will be executed.<br/>
+ (1-31, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">mday</td>
- <td width="75%" class="vtable">
- <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Day of the Month</td>
+ <td width="90%" class="vtable">
+ <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" /><br/>
+ The day(s) of the month on which the command will be executed.<br/>
+ (1-31, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">month</td>
- <td width="75%" class="vtable">
- <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Month of the Year</td>
+ <td width="90%" class="vtable">
+ <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" /><br/>
+ The month(s) of the year during which the command will be executed.<br/>
+ (1-12, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">wday</td>
- <td width="75%" class="vtable">
- <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Day of the Week</td>
+ <td width="90%" class="vtable">
+ <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" /><br/>
+ The day(s) of the week on which the command will be executed.<br/>
+ (0-7, 7=Sun or use names, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">who</td>
- <td width="75%" class="vtable">
- <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" />
+ <td width="10%" valign="top" class="vncellreq">User</td>
+ <td width="90%" class="vtable">
+ <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" /><br/>
+ The user executing the command (typically "root")
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">command</td>
- <td width="75%" class="vtable">
- <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea>
+ <td width="10%" valign="top" class="vncellreq">Command</td>
+ <td width="90%" class="vtable">
+ <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea><br/>
+ The <strong>full path</strong> to the command, plus parameters.
</td>
</tr>
<tr>
@@ -178,6 +190,18 @@ function show_advanced_config() {
<?php endif; ?>
</td>
</tr>
+ <tr class="listtopic">
+ <td colspan="2">Help</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ 'Using "*" for a time entry means "all" or "every", and is the same as a range from first to last.
+ <br/>Ranges may also be used, for example "1-5" in the "Day of Week" field means Monday through Friday.
+ <br/>Time entries may be divided and will be executed when they divide evenly, for example "*/15" in the Minute field means "Every 15 minutes".
+ <br/><br/>For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+ and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
+ </td>
+ </tr>
</table>
</form>
<br />
diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml
index 19b6b577..a096b850 100644
--- a/config/haproxy-devel/haproxy.xml
+++ b/config/haproxy-devel/haproxy.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>haproxy</name>
- <version>0.33</version>
+ <version>0.35</version>
<title>HAProxy</title>
<aftersaveredirect>/pkg_edit.php?xml=haproxy_pools.php</aftersaveredirect>
<include_file>/usr/local/pkg/haproxy.inc</include_file>
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index 3d614fe0..8dce42ee 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -43,7 +43,10 @@ $a_frontendmode = array();
$a_frontendmode['http'] = array('name' => "http / https(offloading)", 'shortname' => "http/https");
$a_frontendmode['https'] = array('name' => "ssl / https(TCP mode)", 'shortname' => "ssl/https");
$a_frontendmode['tcp'] = array('name' => "tcp", 'shortname' => "tcp");
-$a_frontendmode['health'] = array('name' => "health", 'shortname' => "health");
+/*
+ if anyone actually used this what was it good for with recent package versions?
+$a_frontendmode['health'] = array('name' => "health", 'shortname' => "health");
+*/
global $a_acltypes;
$a_acltypes = array();
@@ -1738,8 +1741,8 @@ function haproxy_writeconf($configpath) {
if ($bind['forwardfor']) {
fwrite ($fd, "\toption\t\t\tforwardfor\n");
fwrite ($fd, "\tacl https ssl_fc\n");
- fwrite ($fd, "\treqadd X-Forwarded-Proto:\ http if !https\n");
- fwrite ($fd, "\treqadd X-Forwarded-Proto:\ https if https\n");
+ fwrite ($fd, "\thttp-request set-header\t\tX-Forwarded-Proto http if !https\n");
+ fwrite ($fd, "\thttp-request set-header\t\tX-Forwarded-Proto https if https\n");
}
}
diff --git a/config/haproxy-devel/pkg/haproxy_socketinfo.inc b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
index cbfb131b..7dbb6221 100644
--- a/config/haproxy-devel/pkg/haproxy_socketinfo.inc
+++ b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
@@ -40,14 +40,18 @@ $show_clients_traffic = "YES";
function haproxy_socket_command($command){
$result = array();
if (file_exists("/tmp/haproxy.socket")) {
- $socket = stream_socket_client('unix:///tmp/haproxy.socket', $errno, $errstr);
+ $socket = @stream_socket_client('unix:///tmp/haproxy.socket', $errno, $errstr);
if ($socket) {
fwrite($socket, "$command\n");
while (!feof($socket)) {
$result[] = fgets($socket);
}
fclose($socket);
+ } else {
+ echo "cannot open command socket, haproxy not running? ({$errstr})";
}
+ } else {
+ echo "haproxy command socket does not exist, haproxy not running?";
}
return $result;
}
diff --git a/config/haproxy-devel/www/haproxy_global.php b/config/haproxy-devel/www/haproxy_global.php
index 4902b966..ce6b249e 100644
--- a/config/haproxy-devel/www/haproxy_global.php
+++ b/config/haproxy-devel/www/haproxy_global.php
@@ -425,29 +425,29 @@ function enable_change(enable_change) {
</tr>
<tr>
<td valign="top" class="vncell">
- 'resolver_retries'
+ Retries
</td>
<td class="vtable">
<input name="resolver_retries" type="text" <?if(isset($pconfig['resolver_retries'])) echo "value=\"{$pconfig['resolver_retries']}\"";?> size="50"/><br/>
- Email address to be used as the sender of the emails.
+ Defines the number of queries to send to resolve a server name before giving up. Default value: 3
</td>
</tr>
<tr>
<td valign="top" class="vncell">
- 'resolver_timeoutretry'
+ Retry timeout
</td>
<td class="vtable">
<input name="resolver_timeoutretry" type="text" <?if(isset($pconfig['resolver_timeoutretry'])) echo "value=\"{$pconfig['resolver_timeoutretry']}\"";?> size="50"/><br/>
- Email address to be used as the sender of the emails.
+ Time between two DNS queries, when no response have been received. Default value: 1s
</td>
</tr>
<tr>
<td valign="top" class="vncell">
- 'resolver_holdvalid'
+ Interval
</td>
<td class="vtable">
<input name="resolver_holdvalid" type="text" <?if(isset($pconfig['resolver_holdvalid'])) echo "value=\"{$pconfig['resolver_holdvalid']}\"";?> size="50"/><br/>
- Email address to be used as the sender of the emails.
+ Interval between two successive name resolution when the last answer was valid. Default value: 10s
</td>
</tr>
<tr><td>&nbsp;</td></tr>
@@ -612,13 +612,22 @@ Minimum and default value is: 1024, bigger values might increase CPU usage.<br/>
</div>
</table>
+<?php if(file_exists("/var/etc/haproxy_test/haproxy.cfg")): ?>
+ <div id="testconfiguration" style="display:none; border-style:dashed; padding: 8px;">
+ <b><i>/var/etc/haproxy_test/haproxy.cfg file contents:</i></b>
+ <?php
+ echo "<pre>" . trim(file_get_contents("/var/etc/haproxy_test/haproxy.cfg")) . "</pre>";
+ ?>
+ </div>
+ <div id="showtestconfiguration">
+ <a onClick="new Effect.Fade('showtestconfiguration'); new Effect.Appear('testconfiguration'); setTimeout('scroll_after_fade();', 250); return false;" href="#">Show</a> automatically generated test configuration.
+ </div>
+<?php endif; ?>
<?php if(file_exists("/var/etc/haproxy/haproxy.cfg")): ?>
<div id="configuration" style="display:none; border-style:dashed; padding: 8px;">
- <b><i>/var/etc/haproxy.cfg file contents:</i></b>
+ <b><i>/var/etc/haproxy/haproxy.cfg file contents:</i></b>
<?php
- if(file_exists("/var/etc/haproxy/haproxy.cfg")) {
- echo "<pre>" . trim(file_get_contents("/var/etc/haproxy/haproxy.cfg")) . "</pre>";
- }
+ echo "<pre>" . trim(file_get_contents("/var/etc/haproxy/haproxy.cfg")) . "</pre>";
?>
</div>
<div id="showconfiguration">
diff --git a/config/haproxy-devel/www/haproxy_listeners_edit.php b/config/haproxy-devel/www/haproxy_listeners_edit.php
index 8e6c1c3d..f26341b2 100644
--- a/config/haproxy-devel/www/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/www/haproxy_listeners_edit.php
@@ -532,8 +532,9 @@ $primaryfrontends = get_haproxy_frontends($excludefrontend);
d = document;
for (i = 0; i < 99; i++) {
el = d.getElementById("table_acls" + "expression" + i);
+ row_v = d.getElementById("tr_view_" + i);
row_e = d.getElementById("tr_edit_" + i);
- row_v = d.getElementById("tr_viewdetail_" + i);
+ row_vd = d.getElementById("tr_viewdetail_" + i);
if (!el || !row_e)
continue;
for (j = 0; j < count; j++) {
@@ -543,10 +544,17 @@ $primaryfrontends = get_haproxy_frontends($excludefrontend);
if (row_v) {
Effect.Fade(row_v,{ duration: 1.0 });
}
+ if (row_vd) {
+ Effect.Fade(row_vd,{ duration: 1.0 });
+ }
} else {
- Effect.Appear(row_e,{ duration: 1.0 });
- if (row_v) {
- Effect.Appear(row_v,{ duration: 1.0 });
+ if (!row_v || (row_v && row_v.style.display == "none")) {
+ // only make the edit row appear if the view row is not still on the screen.
+ // (when switching frontend types)
+ Effect.Appear(row_e,{ duration: 1.0 });
+ }
+ if (row_vd) {
+ Effect.Appear(row_vd,{ duration: 1.0 });
}
}
}
diff --git a/config/haproxy-devel/www/haproxy_pool_edit.php b/config/haproxy-devel/www/haproxy_pool_edit.php
index 2b4787f3..54d9031f 100644
--- a/config/haproxy-devel/www/haproxy_pool_edit.php
+++ b/config/haproxy-devel/www/haproxy_pool_edit.php
@@ -491,7 +491,6 @@ foreach($simplefields as $field){
?>
<style type="text/css">
- .tableA_servers_details_visible{display:none;}
.haproxy_stats_visible{display:none;}
.haproxy_check_enabled{display:none;}
.haproxy_check_http{display:none;}
@@ -543,7 +542,12 @@ foreach($simplefields as $field){
function updatevisibility()
{
d = document;
- setCSSdisplay(".tableA_servers_details_visible", server_advanced_options_visible.checked);
+ // IE needs components found into javascript variables
+ stats_enabled = d.getElementById("stats_enabled");
+ persist_cookie_enabled = d.getElementById("persist_cookie_enabled");
+ agent_check = d.getElementById("agent_check");
+ sticky_type_description = d.getElementById("sticky_type_description");
+
setCSSdisplay(".haproxy_stats_visible", stats_enabled.checked);
setCSSdisplay(".haproxy_cookie_visible", persist_cookie_enabled.checked);
@@ -611,7 +615,7 @@ foreach($simplefields as $field){
</td>
</tr>
<tr align="left">
- <td class="vncell" colspan="3"><strong>Server list</strong><input id="server_advanced_options_visible" name="server_advanced_options_visible" type='checkbox' onclick="updatevisibility();">Show advanced options(servers need to first be saved to configure these settings)</input>
+ <td class="vncell" colspan="3"><strong>Server list</strong>
<span style="float:right;">
Toggle serverlist help. <a onclick="toggleCSSdisplay('.haproxy_help_serverlist');" title="<?php echo gettext("Help"); ?>"><img style="vertical-align:middle" src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_help.gif" border="0" alt="help" /></a>
</span>
@@ -893,7 +897,8 @@ foreach($simplefields as $field){
<?
echo_html_select("httpcheck_method",$a_httpcheck_method,$pconfig['httpcheck_method']);
?>
- <br/>OPTIONS is the method usually best to perform server checks, HEAD and GET can also be used
+ <br/>OPTIONS is the method usually best to perform server checks, HEAD and GET can also be used.
+ If the server gets marked as down in the stats page then changing this to GET usually has the biggest chance of working, but might cause more processing overhead on the websever and is less easy to filter out of its logs.
</td>
</tr>
<tr align="left" class="haproxy_check_http">
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index c0e81b27..7bfc6f0e 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -198,9 +198,9 @@ function pfb_global() {
$pfb['24hour'] = $pfb['config']['pfb_dailystart']; // Start hour of the 'Once a day' schedule
$pfb['iplocal'] = $config['interfaces']['lan']['ipaddr']; // Lan IP address
$pfb['dnsbl'] = $pfb['dnsblconfig']['pfb_dnsbl']; // Enabled state of DNSBL
- $pfb['dnsbl_port'] = $pfb['dnsblconfig']['pfb_dnsport'] ?: ''; // Lighttpd web server http port setting
- $pfb['dnsbl_port_ssl'] = $pfb['dnsblconfig']['pfb_dnsport_ssl']?: ''; // Lighttpd web server https port setting
- $pfb['dnsbl_alexa'] = $pfb['dnsblconfig']['alexa_enable']; // Alexa whitelist
+ $pfb['dnsbl_port'] = $pfb['dnsblconfig']['pfb_dnsport']; // Lighttpd web server http port setting
+ $pfb['dnsbl_port_ssl'] = $pfb['dnsblconfig']['pfb_dnsport_ssl']; // Lighttpd web server https port setting
+ $pfb['dnsbl_alexa'] = $pfb['dnsblconfig']['alexa_enable']; // Alexa whitelist
// Restore previous download on failure (default to 'on')
$pfb['restore'] = $pfb['config']['restore_feed'] != '' ? $pfb['config']['restore_feed'] : 'on';
@@ -236,6 +236,7 @@ pfb_global();
// DNSBL Lighttpd HTTPS Daemon (Scans Lighttpd dnsbl_error.log for requested https domain names)
if ($argv[1] == 'dnsbl') {
+ set_time_limit(0);
pfb_livetail($pfb['dnserrlog'], 'dnsbl');
exit;
}
@@ -1325,7 +1326,7 @@ function pfb_download_failure($alias, $header, $pfbfolder, $vtype, $list_url) {
// Query Firewall aliastables
$result = find_reported_header($ip, "{$pfbfolder}/*", TRUE);
if (!empty($result)) {
- $log = " [ {$ip} ] Firewall IP block found in: [ {$result} ]\n";
+ $log = " [ {$ip} ] Firewall IP block found in: [ {$result[1]} | {$result[0]} ]\n";
pfb_logger("{$log}", 2);
$pfbfound = TRUE;
}
@@ -1778,7 +1779,7 @@ function sync_package_pfblockerng($cron='') {
log_error('[pfBlockerNG] Sync terminated during boot process.');
return;
}
- syslog(LOG_NOTICE, '[pfBlockerNG] Starting sync process.');
+ syslog(LOG_NOTICE, '[pfBlockerNG] Starting cron process.');
// Reloads existing lists without downloading new lists when defined 'on'
$pfb['reuse'] = $pfb['config']['pfb_reuse'];
@@ -4119,7 +4120,8 @@ function sync_package_pfblockerng($cron='') {
$log = "\n===[ Aliastables / Rules ]================================\n\n";
pfb_logger("{$log}", 1);
- $log = "Firewall Rule Changes found, Applying Filter Reload\n";
+ $log = "Firewall rule changes found, applying Filter Reload\n";
+ syslog(LOG_NOTICE, "[pfBlockerNG] {$log}");
pfb_logger("{$log}", 1);
}
@@ -4142,7 +4144,8 @@ function sync_package_pfblockerng($cron='') {
$log = "\n\n===[ Aliastables / Rules ]==========================================\n\n";
pfb_logger("{$log}", 1);
- $log = "No Changes to Firewall Rules, Skipping Filter Reload\n";
+ $log = "No changes to Firewall rules, skipping Filter Reload\n";
+ syslog(LOG_NOTICE, "[pfBlockerNG] {$log}");
pfb_logger("{$log}", 1);
// Only Save Aliases that have been updated.
@@ -4777,4 +4780,4 @@ function pfblockerng_do_xmlrpc_sync($sync_to_ip, $port, $protocol, $username, $p
}
return $success;
}
-?>
+?> \ No newline at end of file
diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php
index 8a368d2e..c88e85a5 100644
--- a/config/pfblockerng/pfblockerng.php
+++ b/config/pfblockerng/pfblockerng.php
@@ -47,7 +47,7 @@ require_once('services.inc');
require_once('/usr/local/pkg/pfblockerng/pfblockerng.inc');
require_once('/usr/local/pkg/pfblockerng/pfblockerng_extra.inc'); // 'include functions' not yet merged into pfSense
-global $config, $pfb;
+global $config, $g, $pfb;
// Extras - MaxMind/Alexa Download URLs/filenames/settings
$pfb['extras'][0]['url'] = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz';
@@ -406,7 +406,7 @@ function pfblockerng_sync_cron() {
// Function to process the downloaded MaxMind database and format into Continent txt files.
function pfblockerng_uc_countries() {
- global $pfb;
+ global $g, $pfb;
$maxmind_cont = "{$pfb['geoipshare']}/country_continent.csv";
$maxmind_cc4 = "{$pfb['geoipshare']}/GeoIPCountryWhois.csv";
@@ -564,7 +564,7 @@ function pfblockerng_uc_countries() {
// Function to process Continent txt files and create Country ISO files and to Generate GUI XML files.
function pfblockerng_get_countries() {
- global $pfb;
+ global $g, $pfb;
$files = array ( 'Africa' => "{$pfb['ccdir']}/Africa_v4.txt",
'Asia' => "{$pfb['ccdir']}/Asia_v4.txt",
diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml
index c7f2c068..9e371e9b 100644
--- a/config/pfblockerng/pfblockerng.xml
+++ b/config/pfblockerng/pfblockerng.xml
@@ -48,7 +48,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pfblockerng</name>
- <version>2.0</version>
+ <version>2.0.3</version>
<title>pfBlockerNG: General Settings</title>
<include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file>
<addedit_string>pfBlockerNG: Save General Settings</addedit_string>
diff --git a/config/pfblockerng/pfblockerng_install.inc b/config/pfblockerng/pfblockerng_install.inc
index 5f4a6986..54d0c374 100644
--- a/config/pfblockerng/pfblockerng_install.inc
+++ b/config/pfblockerng/pfblockerng_install.inc
@@ -34,7 +34,7 @@
require_once('/usr/local/pkg/pfblockerng/pfblockerng.inc');
require_once('/usr/local/www/pfblockerng/pfblockerng.php');
-global $config, $pfb, $static_output;
+global $config, $g, $pfb, $static_output;
pfb_global();
function update_static_output($text) {
@@ -184,6 +184,7 @@ unlink_if_exists('/usr/local/sbin/lighttpd_pfb');
link('/usr/local/sbin/lighttpd', '/usr/local/sbin/lighttpd_pfb');
update_static_output(" done.\nCreating DNSBL web server start-up script...");
+$pfb['dnsbl_conf'] = '/var/unbound/pfb_dnsbl_lighty.conf';
$rc = array();
$rc['file'] = 'dnsbl.sh';
$rc['start'] = <<<EOF
@@ -255,7 +256,7 @@ debug.log-condition-handling = "enable"
\$SERVER["socket"] == "0.0.0.0:{$pfb['dnsbl_port_ssl']}" {
ssl.engine = "enable"
- ssl.pemfile = "{$pfb['dnsbl_cert']}"
+ ssl.pemfile = "/var/unbound/dnsbl_cert.pem"
ssl.use-sslv2 = "disable"
ssl.use-sslv3 = "disable"
ssl.honor-cipher-order = "enable"
@@ -273,7 +274,7 @@ EOF;
update_static_output(" done.\n");
update_static_output("Starting DNSBL Service...");
- start_service('dnsbl');
+ restart_service('dnsbl');
update_static_output(" done.\n");
}
@@ -281,4 +282,4 @@ unset($g['pfblockerng_install']); // Remove 'Install flag'
update_static_output("Custom commands completed ... ");
return TRUE;
-?> \ No newline at end of file
+?>
diff --git a/config/pfblockerng/pfblockerng_top20.xml b/config/pfblockerng/pfblockerng_top20.xml
index 6200a6a9..ed3354f1 100644
--- a/config/pfblockerng/pfblockerng_top20.xml
+++ b/config/pfblockerng/pfblockerng_top20.xml
@@ -282,6 +282,7 @@
<option><name>Alias Deny</name><value>Alias_Deny</value></option>
<option><name>Alias Permit</name><value>Alias_Permit</value></option>
<option><name>Alias Match</name><value>Alias_Match</value></option>
+ <option><name>Alias Native</name><value>Alias_Native</value></option>
</options>
</field>
<field>
@@ -394,4 +395,4 @@
sync_package_pfblockerng();
]]>
</custom_php_resync_config_command>
-</packagegui> \ No newline at end of file
+</packagegui>
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc
index 22e70c95..253dab9d 100644
--- a/config/sarg/sarg.inc
+++ b/config/sarg/sarg.inc
@@ -94,7 +94,9 @@ function sarg_check_dirs() {
if (is_dir($pbidir) && !is_link($pbidir)) {
rmdir_recursive($pbidir);
}
- symlink("/usr/local/sarg-reports", "{$pbidir}");
+ if (!is_link($pbidir)) {
+ symlink("/usr/local/sarg-reports", "{$pbidir}");
+ }
}
// images
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 730e7a75..d376401b 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -118,7 +118,7 @@
<category>Security</category>
<pkginfolink>https://forum.pfsense.org/index.php?topic=86212.0</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file>
- <version>2.0.2</version>
+ <version>2.0.3</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<maintainer>BBCan177@gmail.com</maintainer>
@@ -172,7 +172,7 @@
</descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>0.34</version>
+ <version>0.35</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -371,10 +371,11 @@
<descr>The cron utility is used to manage commands on a schedule.</descr>
<category>System</category>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.2</required_version>
<configurationfile>cron.xml</configurationfile>
+ <maximum_version>2.2.999</maximum_version>
</package>
<package>
<name>vHosts</name>
@@ -634,7 +635,7 @@
<config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file>
<pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
<depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi>
- <version>0.6.9</version>
+ <version>0.6.10</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<port_category>www</port_category>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 99f3b8d0..adc1a9f2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -177,7 +177,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.33</version>
+ <version>1.5.3 pkg v 0.35</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -423,7 +423,7 @@
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>cron.xml</configurationfile>
@@ -640,7 +640,7 @@
<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
<depends_on_package_pbi>sarg-2.3.6_2-i386.pbi</depends_on_package_pbi>
- <version>2.3.6_2 pkg v0.6.9</version>
+ <version>2.3.6_2 pkg v0.6.10</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>sarg.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index ad35f798..80d9d879 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -177,7 +177,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.33</version>
+ <version>1.5.3 pkg v 0.35</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
@@ -423,7 +423,7 @@
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>cron.xml</configurationfile>
@@ -640,7 +640,7 @@
<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
<depends_on_package_pbi>sarg-2.3.6_2-amd64.pbi</depends_on_package_pbi>
- <version>2.3.6_2 pkg v0.6.9</version>
+ <version>2.3.6_2 pkg v0.6.10</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>sarg.xml</configurationfile>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 08:02:50 +0000