aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/postfix/postfix.inc17
-rw-r--r--config/postfix/postfix_recipients.php (renamed from config/postfix/postfix_recipientes.php)0
-rw-r--r--config/postfix/postfix_recipients.xml3
-rw-r--r--config/postfix/postfix_view_config.php2
-rw-r--r--config/squid/squid.inc3
-rw-r--r--config/widget-antivirus/antivirus_status.widget.php4
-rw-r--r--pkg_config.8.xml8
-rw-r--r--pkg_config.8.xml.amd648
8 files changed, 29 insertions, 16 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 2a762ae4..5577f4d5 100644
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -59,7 +59,7 @@ function sync_relay_recipients($via_cron="cron"){
if($postfix_recipients_config['enable_ldap']){
#validate cront job
if(preg_match("/(\d+)(\w)/",$postfix_recipients_config['freq'],$matches)){
- $cron_sufix="\t*\t*\troot\t/usr/local/bin/php /usr/local/www/postfix_recipientes.php";
+ $cron_sufix="\t*\t*\troot\t/usr/local/bin/php /usr/local/www/postfix_recipients.php";
switch ($matches[2]){
case m:
$cron= "*/".$matches[1]."\t*\t*".$cron_sufix;
@@ -76,9 +76,9 @@ function sync_relay_recipients($via_cron="cron"){
#update cront job file
$crontab = file('/etc/crontab');
foreach ($crontab as $line)
- $new_cron.=(preg_match("/postfix_recipientes.php/",$line)?$cron."\n":$line);
+ $new_cron.=(preg_match("/postfix_recipients.php/",$line)?$cron."\n":$line);
#include if conf does not exist in crontab
- $new_cron.=(!preg_match("/postfix_recipientes.php/",$new_cron)?"\n".$cron."\n\n":"");
+ $new_cron.=(!preg_match("/postfix_recipients.php/",$new_cron)?"\n".$cron."\n\n":"");
file_put_contents("/etc/crontab",$new_cron, LOCK_EX);
#check crontab changes
$md5_new_file = trim(md5_file('/etc/crontab'));
@@ -139,12 +139,12 @@ function sync_relay_recipients($via_cron="cron"){
}
}
#save all relay recipients and reload postfix
- file_put_contents("/usr/local/etc/postfix/relay_recipientes",$relay_ldap_recipients."\n".$relay_recipients, LOCK_EX);
- exec("/usr/local/sbin/postmap /usr/local/etc/postfix/relay_recipientes");
+ file_put_contents("/usr/local/etc/postfix/relay_recipients",$relay_ldap_recipients."\n".$relay_recipients, LOCK_EX);
+ exec("/usr/local/sbin/postmap /usr/local/etc/postfix/relay_recipients");
mwexec("/usr/local/sbin/postfix reload");
}
if($relay_recipients !="" || $relay_ldap_recipients!="")
- return("relay_recipient_maps = hash:/usr/local/etc/postfix/relay_recipientes\n");
+ return("relay_recipient_maps = hash:/usr/local/etc/postfix/relay_recipients\n");
}
function sync_package_postfix() {
global $config;
@@ -190,6 +190,9 @@ function sync_package_postfix() {
else
$new_sys_log .= $new_line;
}
+ if (!file_exists('/root/system.inc.backup')) {
+ copy ($sys_log_file,'/root/system.inc.backup');
+ }
file_put_contents($sys_log_file,$new_sys_log, LOCK_EX);
#mwexec('/usr/local/bin/php -q /usr/local/www/postfix_syslog.php');
#restart syslog daemon
@@ -594,7 +597,7 @@ function postfix_validate_input($post, &$input_errors) {
function postfix_php_install_command() {
#small freebsd packages for full functional ldap and spf options
system('/usr/sbin/pkg_add -r postfix-policyd-spf');
- system('/usr/sbin/pkg_add -r p5-perl-ldap');
+ #system('/usr/sbin/pkg_add -r p5-perl-ldap');
sync_package_postfix();
}
diff --git a/config/postfix/postfix_recipientes.php b/config/postfix/postfix_recipients.php
index 0deb2f79..0deb2f79 100644
--- a/config/postfix/postfix_recipientes.php
+++ b/config/postfix/postfix_recipients.php
diff --git a/config/postfix/postfix_recipients.xml b/config/postfix/postfix_recipients.xml
index 4172f2c8..450b6df4 100644
--- a/config/postfix/postfix_recipients.xml
+++ b/config/postfix/postfix_recipients.xml
@@ -128,7 +128,8 @@
<fielddescr>Enable LDAP fetch</fielddescr>
<fieldname>enable_ldap</fieldname>
<type>checkbox</type>
- <description>Extract valid email addresses from Active Directory.</description>
+ <description><![CDATA[Extract valid email addresses from Active Directory.<br>
+ Before using LDAP fetch you must install p5-perl-ldap package(hint: <strong>/usr/sbin/pkg_add -r p5-perl-ldap</strong>)]]></description>
</field>
<field>
<fielddescr>Frequency</fielddescr>
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index ac6ad36b..1b3e9fc5 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -86,7 +86,7 @@ include("head.inc");
<?php
$files_array[]="/usr/local/etc/postfix/main.cf";
$files_array[]="/usr/local/etc/postfix/master.cf";
- $files_array[]="/usr/local/etc/postfix/relay_recipientes";
+ $files_array[]="/usr/local/etc/postfix/relay_recipients";
$files_array[]="/usr/local/etc/postfix/header_check";
$files_array[]="/usr/local/etc/postfix/mime_check";
$files_array[]="/usr/local/etc/postfix/body_check";
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 7a31f750..ad98ab14 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -690,6 +690,7 @@ function squid_resync_cache() {
$memory_cache_size = ($settings['memory_cache_size'] ? $settings['memory_cache_size'] : 8);
$max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size'] : 10);
$min_objsize = ($settings['minimum_object_size'] ? $settings['minimum_object_size'] : 0);
+ $max_objsize_in_mem = ($settings['maximum_objsize_in_mem'] ? $settings['maximum_objsize_in_mem'] : 32);
$cache_policy = ($settings['cache_replacement_policy'] ? $settings['cache_replacement_policy'] : 'heap LFUDA');
$memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF');
$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
@@ -712,7 +713,7 @@ function squid_resync_cache() {
$conf = <<<EOD
cache_mem $memory_cache_size MB
-maximum_object_size_in_memory 32 KB
+maximum_object_size_in_memory $max_objsize_in_mem KB
memory_replacement_policy $memory_policy
cache_replacement_policy $cache_policy
cache_dir $disk_cache_opts
diff --git a/config/widget-antivirus/antivirus_status.widget.php b/config/widget-antivirus/antivirus_status.widget.php
index 4dedcb0a..bcd057b3 100644
--- a/config/widget-antivirus/antivirus_status.widget.php
+++ b/config/widget-antivirus/antivirus_status.widget.php
@@ -70,9 +70,13 @@ function dwg_avbases_info()
{
$db = '<table width="100%" border="0" cellspacing="0" cellpadding="1" ><tbody>';
$db .= '<tr class="vncellt" ><td>Database</td><td>Date</td><td>Ver.</td><td>Builder</td></tr>';
+ $db .= havp_avdb_info("daily.cld");
$db .= havp_avdb_info("daily.cvd");
+ $db .= havp_avdb_info("bytecode.cld");
$db .= havp_avdb_info("bytecode.cvd");
+ $db .= havp_avdb_info("main.cld");
$db .= havp_avdb_info("main.cvd");
+ $db .= havp_avdb_info("safebrowsing.cld");
$db .= havp_avdb_info("safebrowsing.cvd");
$db .= '</tbody></table>';
return $db;
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e86a78e4..66e4f0b6 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -370,12 +370,14 @@
<package>
<name>Postfix Forwarder</name>
<website>http://www.postfix.org/</website>
- <descr>Postfix mail forwarder acts as a relay to send incoming mail to the designated mail server for each domain.</descr>
+ <descr><![CDATA[Postfix mail forwarder acts as a relay server for your domain.<br>
+ It can do first and second line antispam combat before sending incoming mail to local mail servers.<br>
+ Postfix also can check RBLS, SPF, seach ldap for valid recipients and use third part antispam engines like policyd and mailscanner for better antispam solution.]]></descr>
<category>Services</category>
<config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <depends_on_package>postfix-2.7.2,1.tbz</depends_on_package>
- <version>2.7.2,1_1.1</version>
+ <depends_on_package>postfix-2.8.4,1.tbz</depends_on_package>
+ <version>2.8.4,1 pkg v.2.0</version>
<status>Beta</status>
<required_version>2.0</required_version>
<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index bcb94b78..d0235ca1 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -408,12 +408,14 @@
<package>
<name>Postfix Forwarder</name>
<website>http://www.postfix.org/</website>
- <descr>Postfix mail forwarder acts as a relay to send incoming mail to the designated mail server for each domain.</descr>
+ <descr><![CDATA[Postfix mail forwarder acts as a relay server for your domain.<br>
+ It can do first and second line antispam combat before sending incoming mail to local mail servers.<br>
+ Postfix also can check RBLS, SPF, seach ldap for valid recipients and use third part antispam engines like policyd and mailscanner for better antispam solution.]]></descr>
<category>Services</category>
<config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <depends_on_package>postfix-2.7.2,1.tbz</depends_on_package>
- <version>2.7.2,1_1.1</version>
+ <depends_on_package>postfix-2.8.4,1.tbz</depends_on_package>
+ <version>2.8.4,1 pkg v.2.0</version>
<status>Beta</status>
<required_version>2.0</required_version>
<configurationfile>postfix.xml</configurationfile>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 19:03:14 +0000