From 5ad41daf4fae42247fa04ad4b8def3ced1d94f2c Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:36:12 -0400
Subject: [PATCH] fix(projectsend) fix projectsend by actually writing the
 config. (#12992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
This should fix the issue with sys.config.php to actually get written.
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 charts/stable/projectsend/Chart.yaml          |  2 +-
 .../projectsend/templates/_configmap.tpl      | 28 ++++++++++
 .../stable/projectsend/templates/common.yaml  | 12 +++-
 charts/stable/projectsend/values.yaml         | 56 +++----------------
 4 files changed, 47 insertions(+), 51 deletions(-)
 create mode 100644 charts/stable/projectsend/templates/_configmap.tpl

diff --git a/charts/stable/projectsend/Chart.yaml b/charts/stable/projectsend/Chart.yaml
index 46ef2641b35..ce6f1a589e9 100644
--- a/charts/stable/projectsend/Chart.yaml
+++ b/charts/stable/projectsend/Chart.yaml
@@ -25,7 +25,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/projectsend
   - https://github.com/projectsend/projectsend
 type: application
-version: 8.0.10
+version: 8.0.11
 annotations:
   truecharts.org/catagories: |
     - files
diff --git a/charts/stable/projectsend/templates/_configmap.tpl b/charts/stable/projectsend/templates/_configmap.tpl
new file mode 100644
index 00000000000..08e0ca0b35f
--- /dev/null
+++ b/charts/stable/projectsend/templates/_configmap.tpl
@@ -0,0 +1,28 @@
+{{/* Define the configmap */}}
+{{- define "projectsend.configmaps" -}}
+{{- $fullname := (include "tc.v1.common.lib.chart.names.fullname" $) -}}
+
+{{- $db := .Values.mariadb.mariadbDatabase -}}
+{{- $dbuser := .Values.mariadb.mariadbUsername -}}
+{{- $dbpassword := .Values.mariadb.creds.mariadbPassword | trimAll "\"" -}}
+{{- $dbhost := .Values.mariadb.creds.plainhost | trimAll "\"" -}}
+
+projectsend-config:
+  enabled: true
+  data:
+    sys.config.php: |
+     <?php
+      define('DB_DRIVER', 'mysql');
+
+      define('DB_NAME', "{{ $db }}");
+      define('DB_HOST', "{{ $dbhost }}");
+      define('DB_USER', "{{ $dbuser }}");
+
+      define('DB_PASSWORD', "{{ $dbpassword }}");
+      define('TABLES_PREFIX', 'tbl_');
+
+      define('SITE_LANG','en');
+      define('MAX_FILESIZE',2048);
+      define('EMAIL_ENCODING', 'utf-8');
+      define('DEBUG', false);
+{{- end -}}
diff --git a/charts/stable/projectsend/templates/common.yaml b/charts/stable/projectsend/templates/common.yaml
index b51394e00a4..f18622952ca 100644
--- a/charts/stable/projectsend/templates/common.yaml
+++ b/charts/stable/projectsend/templates/common.yaml
@@ -1 +1,11 @@
-{{ include "tc.v1.common.loader.all" . }}
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.v1.common.loader.init" . -}}
+
+{{/* Render configmaps for all pods */}}
+{{- $configmaps := include "projectsend.configmaps" . | fromYaml -}}
+{{- if $configmaps -}}
+  {{- $_ := mustMergeOverwrite .Values.configmap $configmaps -}}
+{{- end -}}
+
+{{/* Render the templates */}}
+{{- include "tc.v1.common.loader.apply" . -}}
diff --git a/charts/stable/projectsend/values.yaml b/charts/stable/projectsend/values.yaml
index d485c5e3c1f..29adee07c88 100644
--- a/charts/stable/projectsend/values.yaml
+++ b/charts/stable/projectsend/values.yaml
@@ -20,54 +20,6 @@ service:
 workload:
   main:
     podSpec:
-      initContainers:
-        initconfig:
-          type: install
-          enabled: true
-          imageSelector: image
-          env:
-            DBNAME: "{{ .Values.mariadb.mariadbDatabase }}"
-            DBUSER: "{{ .Values.mariadb.mariadbUsername }}"
-            DBPASS:
-              secretKeyRef:
-                expandObjectName: false
-                name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}'
-                key: mariadb-password
-            DBHOST:
-              secretKeyRef:
-                expandObjectName: false
-                name: '{{ printf "%s-%s" .Release.Name "mariadbcreds" }}'
-                key: plainhost
-          command:
-            - /bin/sh
-            - -c
-          args:
-            - |-
-              export configFile="/app/www/public/includes/sys.config.php";
-              if [ ! -f $configFile ];
-              then
-                echo "Creating initial config file...";
-                mkdir -p /config/projectsend;
-                touch $configFile;
-                echo "<?php" >> $configFile;
-                echo "# This is generated on initial setup of this TrueCharts App" >> $configFile;
-                echo "# Do not change below values, or DB connection will fail." >> $configFile;
-                echo "define('DB_DRIVER', 'mysql');" >> $configFile;
-                echo "define('DB_NAME', '$DBNAME');" >> $configFile;
-                echo "define('DB_HOST', '$DBHOST');" >> $configFile;
-                echo "define('DB_USER', '$DBUSER');" >> $configFile;
-                echo "define('DB_PASSWORD', '$DBPASS');" >> $configFile;
-                echo "define('MAX_FILESIZE', $MAX_UPLOAD);" >> $configFile;
-                echo "define('TABLES_PREFIX', 'tbl_');" >> $configFile;
-                echo "# You can manually change below values if you like." >> $configFile;
-                echo "define('SITE_LANG', 'en');" >> $configFile;
-                echo "define('EMAIL_ENCODING', 'utf-8');" >> $configFile;
-                echo "define('DEBUG', false);" >> $configFile;
-                echo "# End of generated config values." >> $configFile;
-                echo "Done!";
-              else
-                echo "Initial config file already exists. Skipping...";
-              fi;
       containers:
         main:
           env:
@@ -79,7 +31,13 @@ persistence:
   config:
     enabled: true
     mountPath: "/config"
-    targetSelectAll: true
+  projectsend-config:
+    enabled: true
+    type: configmap
+    objectName: projectsend-config
+    mountPath: /config/projectsend/sys.config.php
+    subPath: sys.config.php
+    readOnly: true
   data:
     enabled: true
     mountPath: "/data"