Merge pull request #85 from openstad/development

Release 1.0.1
openstad · Oct 12, 2022 · c79d92c · c79d92c
2 parents 6de9989 + e013f7d
commit c79d92c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/k8s/openstad/Chart.yaml b/k8s/openstad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: openstad
-version: 1.0.0
+version: 1.0.1
 appVersion: "1.0"
 description: This chart deploys the OpenStad Apostrophe project with optional databases.
 icon: https://openstad.org/uploads/attachments/ckf3z5imd3w4pnl3w91not6qs-favicon-2x.svg
diff --git a/k8s/openstad/templates/auth/deployment.yaml b/k8s/openstad/templates/auth/deployment.yaml
@@ -147,7 +147,10 @@ spec:
             value: https://{{ template "openstad.admin.url" . }}
 
           - name: FROM_NAME
-            value: "Openstad api"
+            value: {{ default .Values.auth.fromName "Openstad api" }}
+
+          - name: FROM_EMAIL
+            value: {{ or .Values.auth.fromEmail .Values.secrets.mail.auth.user }}
 
           - name: AUTH_FIRST_CLIENT_LOGIN_CODE
             valueFrom:
@@ -179,9 +182,6 @@ spec:
                 key: admin_client_secret
                 name: openstad-auth-credentials
 
-          - name: FROM_EMAIL
-            value: {{ .Values.secrets.mail.auth.user }}
-
           - name: DEFAULT_FAVICON
             value: {{ .Values.auth.defaultFavicon }}
 

diff --git a/k8s/openstad/templates/secrets/mongo-secret.yaml b/k8s/openstad/templates/secrets/mongo-secret.yaml
@@ -9,5 +9,5 @@ metadata:
 data:
   password: {{ .Values.secrets.mongodb.password | default "" | b64enc | quote }}
   frontend-connection-string: {{ .Values.secrets.mongodb.frontendConnectionString | default "" | b64enc | quote }}
-  auth-connection-string: {{ .Values.secrets.mongodb.authConnectionString | default "" | replace "{database}" "sessions" | b64enc | quote }}
+  auth-connection-string: {{ .Values.secrets.mongodb.authConnectionString | default "" | b64enc | quote }}
   admin-connection-string: {{ .Values.secrets.mongodb.adminConnectionString | default "" | b64enc | quote }}
diff --git a/k8s/openstad/values.yaml b/k8s/openstad/values.yaml
@@ -339,6 +339,8 @@ auth:
 
   defaultFavicon:
 
+  fromName:
+  fromEmail:
 
 ## Settings for the Admin server
 admin: