From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
server/plugins-available/postfix_server_plugin.inc.php | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 3732cc7..98dd675 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -80,13 +80,13 @@
// get the config
$app->uses("getconf");
- $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
+ $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"] != '') {
+ if($mail_config['relayhost'] != '') {
+ exec("postconf -e 'relayhost = ".$mail_config['relayhost']."'");
+ if($mail_config['relayhost_user'] != '' && $mail_config['relayhost_password'] != '') {
exec("postconf -e 'smtp_sasl_auth_enable = yes'");
} else {
exec("postconf -e 'smtp_sasl_auth_enable = no'");
@@ -95,22 +95,38 @@
exec("postconf -e 'smtp_sasl_security_options ='");
// Store the sasl passwd
- $content = $mail_config["relayhost"]." ".$mail_config["relayhost_user"].":".$mail_config["relayhost_password"];
+ $content = $mail_config['relayhost'].' '.$mail_config['relayhost_user'].':'.$mail_config['relayhost_password'];
file_put_contents('/etc/postfix/sasl_passwd',$content);
- exec("chown root:root /etc/postfix/sasl_passwd");
- exec("chmod 600 /etc/postfix/sasl_passwd");
- exec("postmap /etc/postfix/sasl_passwd");
- exec("/etc/init.d/postfix restart");
+ chmod('/etc/postfix/sasl_passwd', 0600);
+ chown('/etc/postfix/sasl_passwd', 'root');
+ chgrp('/etc/postfix/sasl_passwd', 'root');
+ exec('postmap /etc/postfix/sasl_passwd');
+ exec($conf['init_scripts'] . '/' . 'postfix restart');
} else {
exec("postconf -e 'relayhost ='");
}
-
- 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)."'");
+
+ if($mail_config['realtime_blackhole_list'] != '') {
+ $rbl_hosts = explode(",",str_replace(" ", "", $mail_config['realtime_blackhole_list']));
+ $options = explode(", ", exec("postconf -h smtpd_recipient_restrictions"));
+ foreach ($options as $key => $value) {
+ if (!preg_match('/reject_rbl_client/', $value)) {
+ $new_options[] = $value;
+ }
+ }
+ foreach ($rbl_hosts as $key => $value) {
+ $new_options[] = "reject_rbl_client ".$value;
+ }
+
+ exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
+ }
+
+ 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)."'");
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1