Apache 2.4 support - Add missing configuration inclusion (vhost files) to a...

Marius Cramer

2014-01-22 8eca284f3d1ddfbf25e6a33541575153b52cadb5

Apache 2.4 support
- Add missing configuration inclusion (vhost files) to apache config

 install/lib/install.lib.php

@@ -666,6 +666,23 @@
    }
}

function hasLine($filename, $search_pattern, $strict = 0) {
    if($lines = @file($filename)) {
        foreach($lines as $line) {
            if($strict == 0) {
                if(stristr($line, $search_pattern)) {
                    return true;
                }
            } else {
                if(trim($line) == $search_pattern) {
                    return true;
                }
            }
        }
    }
    return false;
}

function is_installed($appname) {
    exec('which '.escapeshellcmd($appname).' 2> /dev/null', $out, $returncode);
    if(isset($out[0]) && stristr($out[0], $appname) && $returncode == 0) {

 install/lib/installer_base.lib.php

@@ -1225,6 +1225,15 @@
            replaceLine('/etc/apache2/ports.conf', 'Listen 443', 'Listen 443', 1);
        }

        if(is_file('/etc/apache2/apache.conf')) {
            if(hasLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 1) == false) {
                if(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.conf', 1) == false) {
                    replaceLine('/etc/apache2/apache.conf', 'Include sites-enabled/', 'Include sites-enabled/', 1, 1);
                } elseif(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 1) == false) {
                    replaceLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 'IncludeOptional sites-enabled/*.vhost', 1, 1);
                }
            }
        }

        //* Copy the ISPConfig configuration include
        $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];