From 445a1d5f5da84b9cd54878a691ac628765cfea23 Mon Sep 17 00:00:00 2001 From: Jan-Niklas Weghorn Date: Sun, 29 Sep 2024 14:57:52 +0200 Subject: [PATCH] feat(vikunja): support mailer configuration --- charts/hortusfox/Chart.yaml | 2 +- charts/overleaf/values.yaml | 2 +- charts/vikunja/.helmignore | 1 + charts/vikunja/Chart.yaml | 2 +- charts/vikunja/README.md | 12 ++++++++++- charts/vikunja/templates/deployment.yaml | 27 ++++++++++++++++++++++++ charts/vikunja/values.yaml | 13 ++++++++++++ 7 files changed, 55 insertions(+), 4 deletions(-) diff --git a/charts/hortusfox/Chart.yaml b/charts/hortusfox/Chart.yaml index 61e03f8..8439d8e 100644 --- a/charts/hortusfox/Chart.yaml +++ b/charts/hortusfox/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: hortusfox -description: Self-hosted collaborative plant management system for your local environment +description: Self-hosted collaborative plant management system for your local environment type: application version: 0.1.0 appVersion: "v3.2" diff --git a/charts/overleaf/values.yaml b/charts/overleaf/values.yaml index 624c908..5911c02 100644 --- a/charts/overleaf/values.yaml +++ b/charts/overleaf/values.yaml @@ -105,7 +105,7 @@ persistence: accessMode: ReadWriteOnce storageClass: "" annotations: {} - + overleaf: appName: "Overleaf" mongodb: diff --git a/charts/vikunja/.helmignore b/charts/vikunja/.helmignore index 0e8a0eb..aa9cbb4 100644 --- a/charts/vikunja/.helmignore +++ b/charts/vikunja/.helmignore @@ -21,3 +21,4 @@ .idea/ *.tmproj .vscode/ +vikunja-*.tgz diff --git a/charts/vikunja/Chart.yaml b/charts/vikunja/Chart.yaml index 0dc248a..0080cdc 100644 --- a/charts/vikunja/Chart.yaml +++ b/charts/vikunja/Chart.yaml @@ -6,7 +6,7 @@ sources: - https://kolaente.dev/vikunja/ - https://gitlab.com/oecis/charts/-/tree/main/charts/vikunja type: application -version: 0.2.0 +version: 0.2.1 appVersion: "0.24.3" dependencies: - condition: postgresql.enabled diff --git a/charts/vikunja/README.md b/charts/vikunja/README.md index 65d53e1..de8cc34 100644 --- a/charts/vikunja/README.md +++ b/charts/vikunja/README.md @@ -1,6 +1,6 @@ # vikunja -![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.0](https://img.shields.io/badge/AppVersion-0.24.0-informational?style=flat-square) +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.3](https://img.shields.io/badge/AppVersion-0.24.3-informational?style=flat-square) The to-do app to organize your life @@ -42,7 +42,17 @@ The to-do app to organize your life | config.jwt.existingSecret | string | `""` | | | config.jwt.secretKeys.jwtSecretKey | string | `"jwt-secret"` | | | config.linkSharing | bool | `true` | | +| config.log.http | string | `"off"` | | | config.log.level | string | `"ERROR"` | | +| config.mailer.authtype | string | `"plain"` | | +| config.mailer.enabled | bool | `false` | | +| config.mailer.existingSecret | string | `""` | | +| config.mailer.force_ssl | bool | `false` | | +| config.mailer.host | string | `""` | | +| config.mailer.password | string | `""` | | +| config.mailer.port | int | `25` | | +| config.mailer.secretKeys.passwordSecretKey | string | `"password"` | | +| config.mailer.username | string | `""` | | | config.publicUrl | string | `"https://tasks.local"` | | | config.registration | bool | `true` | | | config.taskAttachments | bool | `true` | | diff --git a/charts/vikunja/templates/deployment.yaml b/charts/vikunja/templates/deployment.yaml index 5ee0a04..62214bf 100644 --- a/charts/vikunja/templates/deployment.yaml +++ b/charts/vikunja/templates/deployment.yaml @@ -58,6 +58,8 @@ spec: env: - name: VIKUNJA_LOG_LEVEL value: {{ .Values.config.log.level }} + - name: VIKUNJA_LOG_HTTP + value: {{ .Values.config.log.http | quote }} {{- if .Values.config.cache.enabled }} - name: VIKUNJA_CACHE_ENABLED value: {{ .Values.config.cache.enabled | quote }} @@ -89,6 +91,31 @@ spec: value: {{ .Values.config.db.user }} - name: VIKUNJA_SERVICE_PUBLICURL value: {{ .Values.config.publicUrl }} + {{- if .Values.config.mailer.enabled }} + - name: VIKUNJA_MAILER_ENABLED + value: {{ .Values.config.mailer.enabled | quote }} + - name: VIKUNJA_MAILER_HOST + value: {{ .Values.config.mailer.host }} + - name: VIKUNJA_MAILER_PORT + value: {{ .Values.config.mailer.port | quote }} + - name: VIKUNJA_MAILER_AUTHTYPE + value: {{ .Values.config.mailer.authtype }} + - name: VIKUNJA_MAILER_PASSWORD + {{- if .Values.config.mailer.existingSecret }} + valueFrom: + secretKeyRef: + name: {{ .Values.config.mailer.existingSecret }} + key: {{ .Values.config.mailer.secretKeys.passwordSecretKey }} + {{- else }} + value: {{ .Values.config.mailer.password }} + {{- end }} + - name: VIKUNJA_MAILER_USERNAME + value: {{ .Values.config.mailer.username }} + - name: VIKUNJA_MAILER_FROMEMAIL + value: {{ .Values.config.mailer.fromemail }} + - name: VIKUNJA_MAILER_FORCESSL + value: {{ .Values.config.mailer.force_ssl | quote }} + {{- end }} {{- if not (empty .Values.extraEnv) }} {{- toYaml .Values.extraEnv | nindent 12 }} {{- end }} diff --git a/charts/vikunja/values.yaml b/charts/vikunja/values.yaml index 79f3275..6fd98c5 100644 --- a/charts/vikunja/values.yaml +++ b/charts/vikunja/values.yaml @@ -97,10 +97,23 @@ postgresql: config: log: level: ERROR + http: "off" jwt: existingSecret: "" secretKeys: jwtSecretKey: jwt-secret + mailer: + enabled: false + host: "" + port: 25 + authtype: "plain" + password: "" + username: "" + force_ssl: false + existingSecret: "" + secretKeys: + passwordSecretKey: password + cache: enabled: false type: redis