From ca47f26dda7eb28f14b2b9c9af7b6ad91dc1a4f2 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Thu, 17 Mar 2022 08:09:31 +0200
Subject: [PATCH] feat(bookstack): Add autogenerated app_key (#2194)

---
 charts/stable/bookstack/Chart.yaml            |  2 +-
 charts/stable/bookstack/questions.yaml        | 14 ++++++++++++-
 .../stable/bookstack/templates/_secrets.tpl   | 20 +++++++++++++++++++
 charts/stable/bookstack/templates/common.yaml |  9 ++++++++-
 charts/stable/bookstack/values.yaml           | 14 ++++++-------
 5 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 charts/stable/bookstack/templates/_secrets.tpl

diff --git a/charts/stable/bookstack/Chart.yaml b/charts/stable/bookstack/Chart.yaml
index c6ce2ebd017..846f2c7b74d 100644
--- a/charts/stable/bookstack/Chart.yaml
+++ b/charts/stable/bookstack/Chart.yaml
@@ -27,7 +27,7 @@ name: bookstack
 sources:
   - https://www.bookstackapp.com/
   - https://hub.docker.com/r/linuxserver/bookstack
-version: 1.0.3
+version: 1.1.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/bookstack/questions.yaml b/charts/stable/bookstack/questions.yaml
index 4e997f775e5..558e7354b8a 100644
--- a/charts/stable/bookstack/questions.yaml
+++ b/charts/stable/bookstack/questions.yaml
@@ -75,7 +75,19 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: APP_URL
+          label: "APP_URL"
+          description: "Application URL eg. https://bookstack.mydomain.com"
+          schema:
+            type: string
+            default: ""
 # Include{containerConfig}
 
   - variable: service
diff --git a/charts/stable/bookstack/templates/_secrets.tpl b/charts/stable/bookstack/templates/_secrets.tpl
new file mode 100644
index 00000000000..d7803986072
--- /dev/null
+++ b/charts/stable/bookstack/templates/_secrets.tpl
@@ -0,0 +1,20 @@
+{{/* Define the secrets */}}
+{{- define "bookstack.secrets" -}}
+---
+
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: bookstack-secrets
+{{- $bookstackprevious := lookup "v1" "Secret" .Release.Namespace "bookstack-secrets" }}
+{{- $app_key := "" }}
+data:
+  {{- if $bookstackprevious}}
+  APP_KEY: {{ index $bookstackprevious.data "APP_KEY" }}
+  {{- else }}
+  {{- $app_key := randAlphaNum 32 }}
+  APP_KEY: {{ $app_key | b64enc }}
+  {{- end }}
+
+{{- end -}}
diff --git a/charts/stable/bookstack/templates/common.yaml b/charts/stable/bookstack/templates/common.yaml
index a6613c2ce21..77eb3a9cacc 100644
--- a/charts/stable/bookstack/templates/common.yaml
+++ b/charts/stable/bookstack/templates/common.yaml
@@ -1 +1,8 @@
-{{ include "common.all" . }}
+{{/* Make sure all variables are set properly */}}
+{{- include "common.setup" . }}
+
+{{/* Render secrets for bookstack */}}
+{{- include "bookstack.secrets" . }}
+
+{{/* Render the templates */}}
+{{ include "common.postSetup" . }}
diff --git a/charts/stable/bookstack/values.yaml b/charts/stable/bookstack/values.yaml
index 1c2e74d490f..87afa714cfc 100644
--- a/charts/stable/bookstack/values.yaml
+++ b/charts/stable/bookstack/values.yaml
@@ -3,11 +3,9 @@ image:
   pullPolicy: IfNotPresent
   tag: v22.02.20220226@sha256:835888c1a466075efd5326a1c52d182c0c37558f60e34fa2a8dd54def8d22e45
 
-# -- environment variables. See more environment variables in the [bookstack documentation](https://hub.docker.com/r/linuxserver/bookstack)
-# @default -- See below
 env:
-  DB_USER: bookstack
-  DB_DATABASE: bookstack
+  DB_USER: "{{ .Values.mariadb.mariadbUsername }}"
+  DB_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}"
 
 securityContext:
   readOnlyRootFilesystem: false
@@ -17,8 +15,6 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
-# -- Configures service settings for the chart.
-# @default -- See values.yaml
 service:
   main:
     ports:
@@ -26,8 +22,6 @@ service:
         port: 10112
         targetPort: 80
 
-# -- Configure persistence settings for the chart under this key.
-# @default -- See values.yaml
 persistence:
   varrun:
     enabled: true
@@ -44,6 +38,10 @@ envValueFrom:
     secretKeyRef:
       name: mariadbcreds
       key: mariadb-password
+  APP_KEY:
+    secretKeyRef:
+      name: bookstack-secrets
+      key: APP_KEY
 
 mariadb:
   enabled: true