From 738c3d47f74d8a117175452aac2cd662b0e3b95b Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 10 Feb 2014 09:14:49 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
install/dist/lib/centos53.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php
index ee586f7..c7e11e5 100644
--- a/install/dist/lib/centos53.lib.php
+++ b/install/dist/lib/centos53.lib.php
@@ -145,7 +145,7 @@
if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~');
$content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before
- if(!preg_match('/^amavis\s+/m', $content)) {
+ if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
af($conf['postfix']['config_dir'].'/master.cf', $content);
--
Gitblit v1.9.1