From 1db3b186c334013817778cd0bfe8edae9c1a0ce3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 05 Feb 2014 09:30:36 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/dist/lib/gentoo.lib.php | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 7078f83..e7aac8c 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -332,14 +332,25 @@
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
- //* Append the configuration for amavisd to the master.cf file
+ // Append the configuration for amavisd to the master.cf file
$content = rf($conf['postfix']['config_dir'].'/master.cf');
-
- if(!stristr($content, '127.0.0.1:10025')) //* Only add the content if we had not addded it before
- {
+ // Only add the content if we had not addded it before
+ if(!preg_match('/^amavis\s+/m', $content)) {
unset($content);
$content = $this->get_template_file('master_cf_amavis', true);
af($conf['postfix']['config_dir'].'/master.cf', $content);
+ $content = rf($conf['postfix']['config_dir'].'/master.cf');
+ }
+ if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {
+ unset($content);
+ $content = $this->get_template_file('master_cf_amavis10025', true);
+ af($conf['postfix']['config_dir'].'/master.cf', $content);
+ $content = rf($conf['postfix']['config_dir'].'/master.cf');
+ }
+ if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {
+ unset($content);
+ $content = $this->get_template_file('master_cf_amavis10027', true);
+ af($conf['postfix']['config_dir'].'/master.cf', $content);
}
unset($content);
--
Gitblit v1.9.1