- fixed vhost template. website settings were overriding handlers of apache...

Marius Cramer

2014-06-06 5a6670bd3c1083f3c6f6652202e7c776745b5eff

- fixed vhost template. website settings were overriding handlers of apache config files, e. g. roundcube

 server/conf/vhost.conf.master

@@ -57,6 +57,10 @@
        </IfModule>

        <Directory {tmpl_var name='web_document_root_www'}>
                # Clear PHP settings of this website
                <FilesMatch ".+\.ph(p[345]?|t|tml)$">
                        SetHandler None
                </FilesMatch>
                Options +FollowSymLinks
                AllowOverride <tmpl_var name='allow_override'>
                <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
@@ -85,6 +89,10 @@
</tmpl_if>
        </Directory>
        <Directory {tmpl_var name='web_document_root'}>
                # Clear PHP settings of this website
                <FilesMatch ".+\.ph(p[345]?|t|tml)$">
                        SetHandler None
                </FilesMatch>
                Options +FollowSymLinks
                AllowOverride <tmpl_var name='allow_override'>
                <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
@@ -186,10 +194,6 @@
            SuexecUserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>
        </IfModule>
</tmpl_if>
        # Clear PHP settings of this website
        <FilesMatch ".+\.ph(p[345]?|t|tml)$">
                SetHandler None
        </FilesMatch>
<tmpl_if name='php' op='==' value='mod'>
        # mod_php enabled
        AddType application/x-httpd-php .php .php3 .php4 .php5