From b14cad0db25c017d6d01e38e0d577417aaa992a4 Mon Sep 17 00:00:00 2001
From: Paul <paul@zom.bi>
Date: Tue, 12 Jan 2021 19:08:05 +0100
Subject: [PATCH] Make database configurable

---
 zombi/mediawiki/templates/_helpers.tpl | 35 ++++++++++++++++++++++++++
 zombi/mediawiki/values.yaml            | 10 ++++++++
 2 files changed, 45 insertions(+)

diff --git a/zombi/mediawiki/templates/_helpers.tpl b/zombi/mediawiki/templates/_helpers.tpl
index 071b314..cedabc2 100644
--- a/zombi/mediawiki/templates/_helpers.tpl
+++ b/zombi/mediawiki/templates/_helpers.tpl
@@ -66,6 +66,41 @@ Common environment values
 - name: ALLOW_PUBLIC_EDIT
   value: "true"  # FIXME
 
+- name: WG_SECRET_KEY
+  value: {{ .Values.wiki.secretKey }}
+
+- name: WG_DB_TYPE
+  value: {{ .Values.database.type }}
+
+- name: WG_DB_SERVER
+  value: {{ .Values.database.server }}
+
+- name: WG_DB_PORT
+  value: {{ .Values.database.port | quote }}
+
+- name: WG_DB_NAME
+  value: {{ .Values.database.name }}
+
+- name: WG_DB_USER
+  {{- if .Values.database.secretName }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.database.secretName }}
+      key: username
+  {{- else }}
+  value: {{ .Values.database.username }}
+  {{- end }}
+
+- name: WG_DB_PASSWORD
+  {{- if .Values.database.secretName }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.database.secretName }}
+      key: password
+  {{- else }}
+  value: {{ .Values.database.password }}
+  {{- end }}
+
 #WG_SITENAME="Test Wiki"
 #WG_SCRIPT_PATH=""
 #WG_SERVER="https://wiki.example.com"
diff --git a/zombi/mediawiki/values.yaml b/zombi/mediawiki/values.yaml
index d3bc650..0e9211a 100644
--- a/zombi/mediawiki/values.yaml
+++ b/zombi/mediawiki/values.yaml
@@ -13,6 +13,16 @@ fullnameOverride: ""
 
 wiki:
   server: "https://wiki.example.org"
+  secretKey: "1166f2af9b8c1e1401f38a11d95628629bef0b75b90d09b296390041d19c3b2c"
+
+database:
+  type: postgres
+  server: postgres.example.org
+  port: 5432
+  name: mediawiki
+  username: mediawiki  # unused if secretName is set
+  password: mediawiki  # unused if secretName is set
+  #secretName: database-secret
 
 persistence:
   enabled: false