FS#3370 - Duplicate directive NameVirtualHost in ispconfig.conf and ports.c...

Till Brehm

2014-03-12 14001d25d34dc8ff3cd8f7ef4be6760a5b56dde7

FS#3370 - Duplicate directive NameVirtualHost in ispconfig.conf and ports.conf?

 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')) {