Merge branch 'release/2.3.9' into craft-webpack

CHANGELOG.md

@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.3.9 - 2020.09.09
+### Changed
+* Better nginx config for local dev, based on `nystudio107/nginx`
+
 ## 2.3.8 - 2020.09.09
 ### Added
 * Added a `queue` docker container to run queue jobs via `./craft queue/listen`

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "keywords": [
     "craft",
     "cms",

docker-config/nginx/default.conf

@@ -1,46 +1,49 @@
 server {
-    listen 80 default_server;
+    listen 80;
+    listen [::]:80;
+
+    server_name _;
     root /var/www/project/cms/web;
-    index index.html index.php;
+    index index.html index.htm index.php;
     charset utf-8;
 
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
+    gzip_static  on;
+
+    ssi on;
+
+    client_max_body_size 0;
+
+    error_page 404 /index.php?$query_string;
 
     access_log off;
-    error_log  /var/log/nginx/error.log error;
+    error_log /dev/stdout info;
 
-    sendfile off;
-    ssi on;
+    location / {
+        try_files $uri/index.html $uri $uri/ /index.php?$query_string;
+    }
 
-    client_max_body_size 10m;
-
-    gzip              on;
-    gzip_http_version 1.0;
-    gzip_proxied      any;
-    gzip_min_length   500;
-    gzip_disable      "MSIE [1-6]\.";
-    gzip_types        text/plain text/xml text/css
-                      text/comma-separated-values
-                      text/javascript
-                      application/x-javascript
-                      application/javascript
-                      application/atom+xml;
-
-    location ~ \.php$ {
+    location ~ [^/]\.php(/|$) {
+        try_files $uri $uri/ /index.php?$query_string;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass php:9000;
         fastcgi_index index.php;
         include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        fastcgi_param HTTP_PROXY "";
+
+        add_header Last-Modified $date_gmt;
+        add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+        if_modified_since off;
+        expires off;
+        etag off;
+
         fastcgi_intercept_errors off;
         fastcgi_buffer_size 16k;
         fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
         fastcgi_read_timeout 300;
     }
-
-    location ~ /\.ht {
-        deny all;
-    }
 }