Fixed a issue with apache 2.4 support on Ubuntu 13.10

Till Brehm

2014-03-13 39e5f011555e9ef1c60c3e417c1de33561b4762a

Fixed a issue with apache 2.4 support on Ubuntu 13.10

 install/lib/installer_base.lib.php

@@ -1243,10 +1243,20 @@

        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) {
                if(hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.conf', 1) == false && hasLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/', 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);
                    replaceLine('/etc/apache2/apache.conf', 'IncludeOptional sites-enabled/*.vhost', 'IncludeOptional sites-enabled/', 1, 1);
                }
            }
        }
		
        if(is_file('/etc/apache2/apache2.conf')) {
            if(hasLine('/etc/apache2/apache2.conf', 'Include sites-enabled/', 1) == false && hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/', 1) == false) {
                if(hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 1) == true) {
                    replaceLine('/etc/apache2/apache2.conf', 'Include sites-enabled/', 'Include sites-enabled/', 1, 1);
                } elseif(hasLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 1) == true) {
                    replaceLine('/etc/apache2/apache2.conf', 'IncludeOptional sites-enabled/*.conf', 'IncludeOptional sites-enabled/', 1, 1);
                }
            }
        }

 install/tpl/apache_ispconfig.conf.master

@@ -104,7 +104,9 @@
        </tmpl_if>
</Directory>

<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>

NameVirtualHost *:80
NameVirtualHost *:443

 server/conf/apache_ispconfig.conf.master

@@ -104,7 +104,9 @@
        </tmpl_if>
</Directory>

<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>

NameVirtualHost *:80
NameVirtualHost *:443