From de0694a08d5e6d9568c230d0cb3efbf9e3f24560 Mon Sep 17 00:00:00 2001
From: Stefan Wieczorek <stefan.wieczorek@mgt-commerce.com>
Date: Thu, 23 Mar 2023 10:25:12 +0100
Subject: [PATCH] .

---
 v2-varnish/WordPress/WordPress | 70 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/v2-varnish/WordPress/WordPress b/v2-varnish/WordPress/WordPress
index b706842..0bbf964 100644
--- a/v2-varnish/WordPress/WordPress
+++ b/v2-varnish/WordPress/WordPress
@@ -1,39 +1,4 @@
 #{"rootDirectory":"","phpVersion":"8.0","varnishCacheSettings":{"cacheLifetime":"604800","controller":"wordpress","excludes":["^\/my-account\/","\/cart\/","\/checkout\/","wp-login.php"],"excludedParams":["__SID","noCache"]}}
-server {
-  listen 8080;
-  listen [::]:8080;
-  {{server_name}}
-  {{root}}
-
-  try_files $uri $uri/ /index.php?$args;
-  index index.php index.html;
-
-  location ~ \.php$ {
-    include fastcgi_params;
-    fastcgi_intercept_errors on;
-    fastcgi_index index.php;
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    try_files $uri =404;
-    fastcgi_read_timeout 3600;
-    fastcgi_send_timeout 3600;
-    fastcgi_param HTTPS "on";
-    fastcgi_param SERVER_PORT 443;
-    fastcgi_pass 127.0.0.1:{{php_fpm_port}};
-    fastcgi_param PHP_VALUE "{{php_settings}}";
-  }
-
-  # WordPress Multisite Subdirectory
-  if (!-e $request_filename) {
-    rewrite /wp-admin$ https://$host$uri permanent;
-    rewrite ^/[_0-9a-zA-Z-]+(/wp-.*) $1 last;
-    rewrite ^/[_0-9a-zA-Z-]+(/.*\.php)$ $1 last;
-  }
-
-  if (-f $request_filename) {
-    break;
-  }
-}
-
 server {
   listen 80;
   listen [::]:80;
@@ -105,6 +70,41 @@ server {
     access_log off;
   }
 
+  if (-f $request_filename) {
+    break;
+  }
+}
+
+server {
+  listen 8080;
+  listen [::]:8080;
+  {{server_name}}
+  {{root}}
+
+  try_files $uri $uri/ /index.php?$args;
+  index index.php index.html;
+
+  location ~ \.php$ {
+    include fastcgi_params;
+    fastcgi_intercept_errors on;
+    fastcgi_index index.php;
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    try_files $uri =404;
+    fastcgi_read_timeout 3600;
+    fastcgi_send_timeout 3600;
+    fastcgi_param HTTPS "on";
+    fastcgi_param SERVER_PORT 443;
+    fastcgi_pass 127.0.0.1:{{php_fpm_port}};
+    fastcgi_param PHP_VALUE "{{php_settings}}";
+  }
+
+  # WordPress Multisite Subdirectory
+  if (!-e $request_filename) {
+    rewrite /wp-admin$ https://$host$uri permanent;
+    rewrite ^/[_0-9a-zA-Z-]+(/wp-.*) $1 last;
+    rewrite ^/[_0-9a-zA-Z-]+(/.*\.php)$ $1 last;
+  }
+
   if (-f $request_filename) {
     break;
   }