From a3bd5334f134d612b7be2d95b47dfdc01837a33c Mon Sep 17 00:00:00 2001
From: Lars Scheibling <lars@scheibling.se>
Date: Mon, 17 Apr 2023 19:51:28 +0000
Subject: [PATCH] Added option to force theme name

---
 .gitlab-ci.yml                 | 2 +-
 Chart/Chart.yaml               | 2 +-
 Chart/templates/configmap.yaml | 6 +++---
 Chart/values.yaml              | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 655fb22..b5910d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.8.4"
+  HELM_CHART_VERSION: "0.8.5"
 
 stages:
   - deploy
diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml
index 0b6d5a9..def318c 100644
--- a/Chart/Chart.yaml
+++ b/Chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cloudypress
 description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit
 type: application
-version: "0.8.4"
+version: "0.8.5"
 appVersion: "6.2.0"
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index 2f0a50c..a1cf103 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -39,13 +39,14 @@ data:
     RUN_COMPOSER: 'true'
     INSTALL_SITE: {{ .Values.site.init.composerPackage }}
     SET_THEME: {{ .Values.site.init.themeName | default "" }}
+    FORCE_THEME_NAME: {{ .Values.site.forceThemeName | default "" }}
     {{- end }}
     
     {{- if and .Values.site.init  .Values.site.init.content .Values.site.init.content.import }}
     RUN_IMPORTS: 'true'
     IMPORT_CONTENT: {{ .Values.site.init.content.url }}
     {{- end }}
-       
+
     {{- if and .Values.site.init  .Values.site.init.database .Values.site.init.database.import }}
     RUN_DATABASEIMPORTS: 'true'
     IMPORT_DATABASE: {{ .Values.site.init.database.url }}
@@ -110,7 +111,6 @@ data:
                         "uri": [
                             "*.php",
                             "*.php/*",
-                            "/wp-admin/",
                             "/wp/wp-admin/"
                         ]
                     }
@@ -119,7 +119,7 @@ data:
                     "action": {
                         "share": "/app/web$uri",
                         "fallback": {
-                            "pass": "applications/php/direct"
+                            "pass": "applications/php/index"
                         }
                     }
                 }
diff --git a/Chart/values.yaml b/Chart/values.yaml
index f1d40fd..9716264 100644
--- a/Chart/values.yaml
+++ b/Chart/values.yaml
@@ -74,6 +74,9 @@ site:
 
     # The name of the theme which the composer package refers to
     themeName: "mycustomer-app-theme"
+    
+    # If needed, force a change of the theme folder name to conform with site requirements
+    # forceThemeName: ""
 
     # Optional: Import content to wp-content directory from zip file
     content: {}