From 9fcf88d06d20076f1b228979e9ed4e8a56f39ef8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 10:28:10 -0400
Subject: [PATCH] Fixed: FS#1388 - Namevirtualhost directive is missing after update. 2nd try ;)
---
install/lib/installer_base.lib.php | 2 +-
install/tpl/apache_ispconfig.conf.master | 6 ------
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index c2fc48f..5b80a3c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1004,7 +1004,7 @@
// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
$content = rf('tpl/apache_ispconfig.conf.master');
- $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
+ $records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
$content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 6b205fd..eefb0ca 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -44,9 +44,3 @@
Alias /awstats-icon "/usr/share/awstats/icon"
-<tmpl_loop name="ip_adresses">
-NameVirtualHost {tmpl_var name="ip_address"}:80
-NameVirtualHost {tmpl_var name="ip_address"}:443
-</tmpl_loop>
-
-
--
Gitblit v1.9.1