diff options
| -rw-r--r-- | config/postfix/postfix.inc | 18 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc index 182f9d00..831e6bb2 100644 --- a/config/postfix/postfix.inc +++ b/config/postfix/postfix.inc @@ -295,22 +295,22 @@ function sync_package_postfix() { } #update /etc/inc/system.inc $sys_log_file='/etc/inc/system.inc'; + $pfsense_version=preg_replace("/\s/","",file_get_contents("/etc/version")); $sys_log = file($sys_log_file); $new_sys_log=""; $found_mail=0; foreach ($sys_log as $line){ $new_line=preg_replace('/mail.(.|crit);/',$mail_syslog,$line); - #set syslog entry mail.* %/var/log/maillog when log_to = system - if (preg_match ('/mail.(.|crit);/',$line) && $postfix_config['log_to'] =="maillog") + if (preg_match('/mail.*system.log/',$line) && $postfix_config['log_to'] =="maillog"){ $new_sys_log .= 'mail.*'."\t\t\t\t\t\t".'/var/log/maillog'."\n"; - #remove syslog entry mail.* %/var/log/maillog when log_to != system - if (preg_match ("/^mail/",$line)) - $new_sys_log .=""; - else - $new_sys_log .= $new_line; + } + if (preg_match('/maillog/',$line)){ + $new_line =""; + } + $new_sys_log .= $new_line; } - if (!file_exists('/root/system.inc.backup')) { - copy ($sys_log_file,'/root/system.inc.backup'); + if (!file_exists('/root/'.$pfsense_version.'.system.inc.backup')) { + copy ($sys_log_file,'/root/'.$pfsense_version.'.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'); diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 114fb5de..be570286 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -366,8 +366,8 @@ <config_file>http://www.pfsense.com/packages/config/postfix/postfix.xml</config_file> <pkginfolink>http://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <depends_on_package>postfix-2.8.5,1.tbz</depends_on_package> - <version>2.8.5,1 pkg v.2.3.2</version> + <depends_on_package>postfix-2.8.7,1.tbz</depends_on_package> + <version>2.8.7,1 pkg v.2.3.3</version> <status>RC1</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 f46f2a45..6a2b4cfb 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -455,7 +455,7 @@ <depends_on_package>postfix-2.8.7,1.tbz</depends_on_package> <depends_on_package>perl-5.12.4_3.tbz</depends_on_package> <depends_on_package_pbi>postfix-2.8.5-amd64.pbi</depends_on_package_pbi> - <version>2.8.7,1 pkg v.2.3.2</version> + <version>2.8.7,1 pkg v.2.3.3</version> <status>RC1</status> <required_version>2.0</required_version> <configurationfile>postfix.xml</configurationfile> |