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/gentoo.lib.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 8c98140..3ee3939 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -335,19 +335,19 @@
// Append the configuration for amavisd to the master.cf file
$content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before
- if(!stristr($content, 'amavis')) {
+ if(!preg_match('/^amavis\s+unix\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(!stristr($content, '127.0.0.1:10025')) {
+ 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(!stristr($content, '127.0.0.1:10027')) {
+ 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);
@@ -1014,19 +1014,19 @@
}
//* Install the update script
- if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) {
- unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
+ if (is_file('/usr/local/bin/ispconfig_update_from_dev.sh')) {
+ unlink('/usr/local/bin/ispconfig_update_from_dev.sh');
}
- chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
- chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
+ chown($install_dir.'/server/scripts/update_from_dev.sh', 'root');
+ chmod($install_dir.'/server/scripts/update_from_dev.sh', 0700);
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
- if (!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) {
- symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
+ if (!is_link('/usr/local/bin/ispconfig_update_from_dev.sh')) {
+ symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_dev.sh');
}
if (!is_link('/usr/local/bin/ispconfig_update.sh')) {
--
Gitblit v1.9.1