FS#3490 - Change permissions of folder protection files for nfs - Changed v...

Till Brehm

2014-07-27 51910d3e188c441412010013efb4b3522e35c696

FS#3490 - Change permissions of folder protection files for nfs
- Changed vhost.conf.master as php-fpm was not working after commit "5a6670bd3c1083f3c6f6652202e7c776745b5eff".

 server/conf/vhost.conf.master

@@ -225,9 +225,16 @@
        # php as cgi enabled
        ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
        Action php5-cgi /php5-cgi
        <FilesMatch "\.php[345]?$">
            SetHandler php5-cgi
        </FilesMatch>
        <Directory {tmpl_var name='web_document_root_www'}>
            <FilesMatch "\.php[345]?$">
                SetHandler php5-cgi
            </FilesMatch>
        </Directory>
        <Directory {tmpl_var name='web_document_root'}>
            <FilesMatch "\.php[345]?$">
                SetHandler php5-cgi
            </FilesMatch>
        </Directory>
        <Directory {tmpl_var name='cgi_starter_path'}>
            <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
            Require all granted
@@ -308,9 +315,16 @@
                    Allow from all
                    </tmpl_if>
                </Directory>
                <FilesMatch "\.php[345]?$">
                    SetHandler php5-fcgi
                </FilesMatch>
                <Directory {tmpl_var name='web_document_root_www'}>
                    <FilesMatch "\.php[345]?$">
                        SetHandler php5-fcgi
                    </FilesMatch>
                </Directory>
                <Directory {tmpl_var name='web_document_root'}>
                    <FilesMatch "\.php[345]?$">
                        SetHandler php5-fcgi
                    </FilesMatch>
                </Directory>
                Action php5-fcgi /php5-fcgi
                Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
<tmpl_if name='use_tcp'>

 server/plugins-available/apache2_plugin.inc.php

@@ -1472,7 +1472,7 @@
        if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
        $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
        $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', $ht_file);
        $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', 0755);
        $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', 0751);
        unset($ht_file);
        //}

@@ -1482,7 +1482,7 @@
                $app->system->web_folder_protection($data['new']['document_root'], false);
                $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats', $htp_file);
                $app->system->web_folder_protection($data['new']['document_root'], true);
                $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats', 0755);
                $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats', 0751);
                unset($htp_file);
            }
        }
@@ -2009,7 +2009,7 @@
        //* Create empty .htpasswd file, if it does not exist
        if(!is_file($folder_path.'.htpasswd')) {
            $app->system->touch($folder_path.'.htpasswd');
            $app->system->chmod($folder_path.'.htpasswd', 0750);
            $app->system->chmod($folder_path.'.htpasswd', 0751);
            $app->system->chown($folder_path.'.htpasswd', $website['system_user']);
            $app->system->chgrp($folder_path.'.htpasswd', $website['system_group']);
            $app->log('Created file '.$folder_path.'.htpasswd', LOGLEVEL_DEBUG);
@@ -2063,7 +2063,7 @@
        unset($old_content);

        $app->system->file_put_contents($folder_path.'.htaccess', $ht_file);
        $app->system->chmod($folder_path.'.htaccess', 0750);
        $app->system->chmod($folder_path.'.htaccess', 0751);
        $app->system->chown($folder_path.'.htaccess', $website['system_user']);
        $app->system->chgrp($folder_path.'.htaccess', $website['system_group']);
        $app->log('Created/modified file '.$folder_path.'.htaccess', LOGLEVEL_DEBUG);
@@ -2225,7 +2225,7 @@
            }

            $app->system->file_put_contents($new_folder_path.'.htaccess', $ht_file);
            $app->system->chmod($new_folder_path.'.htaccess', 0750);
            $app->system->chmod($new_folder_path.'.htaccess', 0751);
            $app->system->chown($new_folder_path.'.htaccess', $website['system_user']);
            $app->system->chgrp($new_folder_path.'.htaccess', $website['system_group']);
            $app->log('Created/modified file '.$new_folder_path.'.htaccess', LOGLEVEL_DEBUG);
@@ -2233,7 +2233,7 @@
            //* Create empty .htpasswd file, if it does not exist
            if(!is_file($folder_path.'.htpasswd')) {
                $app->system->touch($new_folder_path.'.htpasswd');
                $app->system->chmod($new_folder_path.'.htpasswd', 0750);
                $app->system->chmod($new_folder_path.'.htpasswd', 0751);
                $app->system->chown($new_folder_path.'.htpasswd', $website['system_user']);
                $app->system->chgrp($new_folder_path.'.htpasswd', $website['system_group']);
                $app->log('Created file '.$new_folder_path.'.htpasswd', LOGLEVEL_DEBUG);