From d5be8964ba83473bd5433ea79341b620d0254db6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 18 Aug 2008 12:09:56 -0400
Subject: [PATCH] Fixed a bug were index.html gets overwriten when a subdomain is added.
---
install/lib/installer_base.lib.php | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ac29988..db98d1f 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -510,7 +510,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("tpl/master_cf_amavis.master");
// Only add the content if we had not addded it before
- if(!stristr("127.0.0.1:10025",$content)) {
+ if(!stristr($content,"127.0.0.1:10025")) {
af($conf["postfix"]["config_dir"].'/master.cf',$content);
}
@@ -536,6 +536,8 @@
public function configure_getmail()
{
+ global $conf;
+
$config_dir = $conf['getmail']['config_dir'];
if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
@@ -601,6 +603,8 @@
public function configure_apache()
{
+ global $conf;
+
//* Create the logging directory for the vhost logfiles
exec('mkdir -p /var/log/ispconfig/httpd');
@@ -612,6 +616,7 @@
$dist_init_scripts = $conf['init_scripts'];
+ if(is_dir("/etc/Bastille.backup")) caselog("rm -rf /etc/Bastille.backup", __FILE__, __LINE__);
if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__);
@mkdir("/etc/Bastille", octdec($directory_mode));
if(is_dir("/etc/Bastille.backup/firewall.d")) caselog("cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/", __FILE__, __LINE__);
--
Gitblit v1.9.1