From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/postfix_server_plugin.inc.php | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index ad92dec..474d10d 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -79,12 +79,12 @@
global $app, $conf;
// get the config
- $app->uses("getconf");
+ $app->uses("getconf,system");
$old_ini_data = $app->ini_parser->parse_ini_string($data['old']['config']);
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
copy('/etc/postfix/main.cf', '/etc/postfix/main.cf~');
-
+
if($mail_config['relayhost'] != '') {
exec("postconf -e 'relayhost = ".$mail_config['relayhost']."'");
if($mail_config['relayhost_user'] != '' && $mail_config['relayhost_password'] != '') {
@@ -109,6 +109,7 @@
}
if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) {
+ $rbl_updated = false;
$rbl_hosts = trim(preg_replace('/\s+/', '', $mail_config['realtime_blackhole_list']));
if($rbl_hosts != ''){
$rbl_hosts = explode(",", $rbl_hosts);
@@ -117,9 +118,18 @@
foreach ($options as $key => $value) {
if (!preg_match('/reject_rbl_client/', $value)) {
$new_options[] = $value;
+ } else {
+ if(is_array($rbl_hosts) && !empty($rbl_hosts) && !$rbl_updated){
+ $rbl_updated = true;
+ foreach ($rbl_hosts as $key => $value) {
+ $value = trim($value);
+ if($value != '') $new_options[] = "reject_rbl_client ".$value;
+ }
+ }
}
}
- if(is_array($rbl_hosts) && !empty($rbl_hosts)){
+ //* first time add rbl-list
+ if (!$rbl_updated && is_array($rbl_hosts) && !empty($rbl_hosts)) {
foreach ($rbl_hosts as $key => $value) {
$value = trim($value);
if($value != '') $new_options[] = "reject_rbl_client ".$value;
@@ -127,6 +137,19 @@
}
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
}
+
+ if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
+ // If dovecot switch to lmtp
+ if($app->system->is_installed('dovecot')) {
+ exec("postconf -e 'virtual_transport = lmtp:unix:private/dovecot-lmtp'");
+ }
+ }
+ else {
+ // If dovecot switch to dovecot
+ if($app->system->is_installed('dovecot')) {
+ exec("postconf -e 'virtual_transport = dovecot'");
+ }
+ }
exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']*1024*1024)."'");
exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']*1024*1024)."'");
--
Gitblit v1.9.1