Merge pull request #5759 from owncloud/fixing-5757-master

adding proper htaccess commands for Apache 2.4
This commit is contained in:
Thomas Müller 2013-11-09 23:13:17 -08:00
commit a8f6a2446c

View file

@ -165,8 +165,19 @@ class OC_Setup {
}
public static function protectDataDirectory() {
$content = "deny from all\n";
$content.= "IndexIgnore *";
//Require all denied
$now = date('Y-m-d H:i:s');
$content = "# Generated by ownCloud on $now\n";
$content.= "# line below if for Apache 2.4\n";
$content.= "<ifModule mod_authz_core>\n";
$content.= "Require all denied\n";
$content.= "</ifModule>\n\n";
$content.= "# line below if for Apache 2.2\n";
$content.= "<ifModule !mod_authz_core>\n";
$content.= "deny from all\n";
$content.= "</ifModule>\n\n";
$content.= "# section for Apache 2.2 and 2.4\n";
$content.= "IndexIgnore *\n";
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
}