1 files changed, 18 insertions, 7 deletions
diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php
index c3c56f9a3c..19b7d8e903 100644
--- a/plugins/Installation/ServerFilesGenerator.php
+++ b/plugins/Installation/ServerFilesGenerator.php
@@ -13,6 +13,17 @@ use Piwik\SettingsServer;
 
 class ServerFilesGenerator
 {
+    public static function createFilesForSecurity()
+    {
+        self::deleteHtAccessFiles();
+        self::createHtAccessFiles();
+
+        self::deleteWebConfigFiles();
+        self::createWebConfigFiles();
+
+        self::createWebRootFiles();
+    }
+
     /**
      * Generate Apache .htaccess files to restrict access
      * .htaccess files are created on all webservers even Nginx, as sometimes Nginx knows how to handle .htaccess files
@@ -64,11 +75,6 @@ class ServerFilesGenerator
         }
     }
 
-    public static function createHtAccessDenyAll($path)
-    {
-        self::createHtAccess($path, $overwrite = false, self::getDenyAllHtaccessContent());
-    }
-
     /**
      * Create .htaccess file in specified directory
      *
@@ -83,6 +89,8 @@ class ServerFilesGenerator
     protected static function createHtAccess($path, $overwrite = true, $content)
     {
         $file = $path . '/.htaccess';
+
+        $content = "# This file is auto generated by Piwik, do not edit directly\n# Please report any issue or improvement directly to the Piwik team.\n\n" . $content;
         if ($overwrite || !file_exists($file)) {
             @file_put_contents($file, $content);
         }
@@ -93,7 +101,7 @@ class ServerFilesGenerator
      *
      * Note: for IIS 7 and above
      */
-    public static function createWebConfigFiles()
+    protected static function createWebConfigFiles()
     {
         if (!SettingsServer::isIIS()) {
             return;
@@ -183,7 +191,10 @@ class ServerFilesGenerator
             '/favicon.ico',
         );
         foreach ($filesToCreate as $file) {
-            @file_put_contents(PIWIK_DOCUMENT_ROOT . $file, '');
+            $path = PIWIK_DOCUMENT_ROOT . $file;
+            if(!file_exists($path)) {
+                @file_put_contents($path, '');
+            }
         }
     }