From c9ab5a31d8da69ca2db056729fd070d6fa86bd00 Mon Sep 17 00:00:00 2001
From: Paul Payne <paul@payne.io>
Date: Sun, 31 Aug 2025 14:46:42 -0700
Subject: [PATCH] Discourse app fixes.

---
 apps/discourse/configmap.yaml  | 26 +++++++-------------------
 apps/discourse/deployment.yaml |  8 ++++----
 apps/discourse/manifest.yaml   |  4 +---
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/apps/discourse/configmap.yaml b/apps/discourse/configmap.yaml
index cd19f49..8f6a46e 100644
--- a/apps/discourse/configmap.yaml
+++ b/apps/discourse/configmap.yaml
@@ -11,33 +11,21 @@ data:
   DISCOURSE_SITE_NAME: "{{ .apps.discourse.siteName }}"
   DISCOURSE_USERNAME: "{{ .apps.discourse.adminUsername }}"
   DISCOURSE_EMAIL: "{{ .apps.discourse.adminEmail }}"
+
   DISCOURSE_REDIS_HOST: "{{ .apps.discourse.redisHostname }}"
   DISCOURSE_REDIS_PORT_NUMBER: "6379"
+
   DISCOURSE_DATABASE_HOST: "{{ .apps.discourse.dbHostname }}"
   DISCOURSE_DATABASE_PORT_NUMBER: "5432"
   DISCOURSE_DATABASE_NAME: "{{ .apps.discourse.dbName }}"
   DISCOURSE_DATABASE_USER: "{{ .apps.discourse.dbUsername }}"
 
-  # DISCOURSE_SMTP_ADDRESS: "{{ .apps.discourse.smtp.host }}"
-  # DISCOURSE_SMTP_PORT: "{{ .apps.discourse.smtp.port }}"
-  # DISCOURSE_SMTP_USER_NAME: "{{ .apps.discourse.smtp.user }}"
-  # DISCOURSE_SMTP_ENABLE_START_TLS: "{{ .apps.discourse.smtp.startTls }}"
-  # DISCOURSE_SMTP_AUTHENTICATION: "login"
-
-  # Bitnami specific environment variables (diverges from the original)
-  # https://techdocs.broadcom.com/us/en/vmware-tanzu/bitnami-secure-images/bitnami-secure-images/services/bsi-app-doc/apps-containers-discourse-index.html
   DISCOURSE_SMTP_HOST: "{{ .apps.discourse.smtp.host }}"
-  DISCOURSE_SMTP_PORT_NUMBER: "{{ .apps.discourse.smtp.port }}"
+  DISCOURSE_SMTP_PORT: "{{ .apps.discourse.smtp.port }}"
   DISCOURSE_SMTP_USER: "{{ .apps.discourse.smtp.user }}"
-  DISCOURSE_SMTP_ENABLE_START_TLS: "{{ .apps.discourse.smtp.startTls }}"
-  DISCOURSE_SMTP_AUTH: "login"
   DISCOURSE_SMTP_PROTOCOL: "tls"
+  DISCOURSE_SMTP_AUTH: "login"
 
-  DISCOURSE_PRECOMPILE_ASSETS: "false"
-
-  # SMTP_HOST: "{{ .apps.discourse.smtp.host }}"
-  # SMTP_PORT: "{{ .apps.discourse.smtp.port }}"
-  # SMTP_USER_NAME: "{{ .apps.discourse.smtp.user }}"
-  # SMTP_TLS: "{{ .apps.discourse.smtp.tls }}"
-  # SMTP_ENABLE_START_TLS: "{{ .apps.discourse.smtp.startTls }}"
-  # SMTP_AUTHENTICATION: "login"
+  # DISCOURSE_PRECOMPILE_ASSETS: "false"
+  # DISCOURSE_SKIP_INSTALL: "no"
+  # DISCOURSE_SKIP_BOOTSTRAP: "yes"
diff --git a/apps/discourse/deployment.yaml b/apps/discourse/deployment.yaml
index c06a78a..aaa8040 100644
--- a/apps/discourse/deployment.yaml
+++ b/apps/discourse/deployment.yaml
@@ -37,7 +37,7 @@ spec:
       initContainers:
       containers:
         - name: discourse
-          image: { { .apps.discourse.image } }
+          image: docker.io/bitnami/discourse:3.4.7-debian-12-r0
           imagePullPolicy: "IfNotPresent"
           securityContext:
             allowPrivilegeEscalation: false
@@ -85,7 +85,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: discourse-secrets
-                  key: apps.discourse.redisPassword
+                  key: apps.redis.password
             - name: DISCOURSE_SECRET_KEY_BASE
               valueFrom:
                 secretKeyRef:
@@ -139,7 +139,7 @@ spec:
               mountPath: /bitnami/discourse
               subPath: discourse
         - name: sidekiq
-          image: { { .apps.discourse.sidekiqImage } }
+          image: docker.io/bitnami/discourse:3.4.7-debian-12-r0
           imagePullPolicy: "IfNotPresent"
           securityContext:
             allowPrivilegeEscalation: false
@@ -182,7 +182,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: discourse-secrets
-                  key: apps.discourse.redisPassword
+                  key: apps.redis.password
             - name: DISCOURSE_SECRET_KEY_BASE
               valueFrom:
                 secretKeyRef:
diff --git a/apps/discourse/manifest.yaml b/apps/discourse/manifest.yaml
index a7e368d..1ab50a2 100644
--- a/apps/discourse/manifest.yaml
+++ b/apps/discourse/manifest.yaml
@@ -6,8 +6,6 @@ requires:
   - name: postgres
   - name: redis
 defaultConfig:
-  image: docker.io/bitnami/discourse:3.4.7-debian-12-r0
-  sidekiqImage: docker.io/bitnami/discourse:3.4.7-debian-12-r0
   timezone: UTC
   port: 8080
   storage: 10Gi
@@ -32,7 +30,7 @@ requiredSecrets:
   - apps.discourse.adminPassword
   - apps.discourse.dbPassword
   - apps.discourse.dbUrl
-  - apps.discourse.redisPassword
+  - apps.redis.password
   - apps.discourse.secretKeyBase
   - apps.discourse.smtpPassword
   - apps.postgres.password
\ No newline at end of file