Comment out the listen directive in the ispconfig.vhost file if the port fo...

tbrehm

2008-11-19 f6d7456d0d6a190053b8b286553321d6264311b8

Comment out the listen directive in the ispconfig.vhost file if the port for ispconfig is 80 or 443.

 install/dist/lib/fedora.lib.php

@@ -619,6 +619,14 @@
         
        $content = rf("tpl/apache_ispconfig.vhost.master");
        $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
		
        // comment out the listen directive if port is 80 or 443
        if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
            $content = str_replace('{vhost_port_listen}', '#', $content);
        } else {
            $content = str_replace('{vhost_port_listen}', '', $content);
        }
		
        wf("$vhost_conf_dir/ispconfig.vhost", $content);
        
        //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");

 install/dist/lib/opensuse.lib.php

@@ -637,6 +637,14 @@
         
        $content = rf("tpl/apache_ispconfig.vhost.master");
        $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
		
        // comment out the listen directive if port is 80 or 443
        if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
            $content = str_replace('{vhost_port_listen}', '#', $content);
        } else {
            $content = str_replace('{vhost_port_listen}', '', $content);
        }
		
        wf("$vhost_conf_dir/ispconfig.vhost", $content);
        
        //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");

 install/lib/installer_base.lib.php

@@ -832,6 +832,14 @@
         
        $content = rf("tpl/apache_ispconfig.vhost.master");
        $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
		
        // comment out the listen directive if port is 80 or 443
        if($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
            $content = str_replace('{vhost_port_listen}', '#', $content);
        } else {
            $content = str_replace('{vhost_port_listen}', '', $content);
        }
		
        wf("$vhost_conf_dir/ispconfig.vhost", $content);
        
        //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");

 install/tpl/apache_ispconfig.vhost.master

@@ -4,7 +4,7 @@
# for the ISPConfig controlpanel
######################################################

Listen {vhost_port}
{vhost_port_listen} Listen {vhost_port}
NameVirtualHost *:{vhost_port}

<VirtualHost _default_:{vhost_port}>