From 81a2fb2c7f91ea828ecce7a24622e16a2446af29 Mon Sep 17 00:00:00 2001
From: Lars Scheibling <lars@scheibling.se>
Date: Tue, 18 Jul 2023 23:29:52 +0200
Subject: [PATCH] Moved 302 section before wildcard section

---
 .gitlab-ci.yml                 |  2 +-
 Chart/templates/configmap.yaml | 46 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c79949..242d0fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "99.6.23"
+  HELM_CHART_VERSION: "99.6.24"
 
 stages:
   - deploy
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index 7aab475..4551a3b 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -81,29 +81,6 @@ data:
                         ]
                     }
                 },
-                {
-                    "action": {
-                        "return": 404
-                    },
-                    "match": {
-                        "uri": [
-                            "/app/uploads/*.php",
-                            "/app/uploads/*.php/*"
-                        ]
-                    }
-                },
-                {
-                    "action": {
-                        "pass": "applications/php/direct"
-                    },
-                    "match": {
-                        "uri": [
-                            "*.php",
-                            "*.php/*",
-                            "/wp/wp-admin/"
-                        ]
-                    }
-                },
                 {
                     "action": {
                         "return": 302,
@@ -128,6 +105,29 @@ data:
                         ]
                     }
                 },
+                {
+                    "action": {
+                        "return": 404
+                    },
+                    "match": {
+                        "uri": [
+                            "/app/uploads/*.php",
+                            "/app/uploads/*.php/*"
+                        ]
+                    }
+                },
+                {
+                    "action": {
+                        "pass": "applications/php/direct"
+                    },
+                    "match": {
+                        "uri": [
+                            "*.php",
+                            "*.php/*",
+                            "/wp/wp-admin/"
+                        ]
+                    }
+                },
                 {{- if eq .Values.site.enableWebpRoute "true" }}
                 {
                     "match": {