Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2014-06-06 efbb88feee52d96ca266485ea2e9d79ce54ff39a

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

 install/tpl/apache_ispconfig.conf.master

@@ -18,6 +18,7 @@

# Do not allow access to the root file system of the server for security reasons
<Directory />
    Options -Indexes
    AllowOverride None
    <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
    Require all denied

 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
@@ -336,7 +340,7 @@
        RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
        
        RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_if name='rewrite_type' value=''><tmpl_if name="rewrite_is_url" op="==" value="n">[PT]</tmpl_if></tmpl_else><tmpl_var name='rewrite_type'></tmpl_if>
        RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
    
</tmpl_loop>
</tmpl_if>

 server/plugins-available/apache2_plugin.inc.php

@@ -2654,7 +2654,7 @@

        $fpm_socket = $socket_dir.$pool_name.'.sock';
        $tpl->setVar('fpm_socket', $fpm_socket);
        $tpl->setVar('fpm_listen_mode', '0600');
        $tpl->setVar('fpm_listen_mode', '0660');

        $tpl->setVar('fpm_pool', $pool_name);
        $tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);