Merge branch 'master' into development

Commit to wrong branch

conf/nginx.conf

@@ -1,33 +1,20 @@
-server {
+location / {
-    listen 80;
+    root __INSTALL_DIR__/public;
-    server_name __DOMAIN_NAME__;
+    try_files $uri $uri/ /index.php?$query_string;
-    root /example.com/public;
-
-    add_header X-Frame-Options "SAMEORIGIN";
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Content-Type-Options "nosniff";
-
     index index.html index.htm index.php;
-
-    charset utf-8;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    error_page 404 /index.php;
-
-    location ~ \.php$ {
-        fastcgi_pass unix:/var/run/php__PHP_VERSION__-fpm.sock;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        include fastcgi_params;
-    }
-
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
 }
+
+
+location ~ \.php$ {
+    root __INSTALL_DIR__/public;
+    index index.html index.htm index.php;
+    fastcgi_pass unix:/var/run/php__PHP_VERSION__-fpm.sock;
+    fastcgi_index index.php;
+    fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+    include fastcgi_params;
+}
+
+location ~ /\.(?!well-known).* {
+    deny all;
+}
+