From 14001d25d34dc8ff3cd8f7ef4be6760a5b56dde7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 12 Mar 2014 04:44:22 -0400
Subject: [PATCH] FS#3370 - Duplicate directive NameVirtualHost in ispconfig.conf and ports.conf?
---
install/lib/installer_base.lib.php | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 507a5d0..093cd5b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1235,6 +1235,10 @@
if(is_file('/etc/apache2/ports.conf')) {
// add a line "Listen 443" to ports conf if line does not exist
replaceLine('/etc/apache2/ports.conf', 'Listen 443', 'Listen 443', 1);
+
+ // Comment out the namevirtualhost lines, as they were added by ispconfig in ispconfig.conf file again
+ replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:80', '# NameVirtualHost *:80', 1);
+ replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:443', '# NameVirtualHost *:443', 1);
}
if(is_file('/etc/apache2/apache.conf')) {
--
Gitblit v1.9.1