From 7dc968f5120540e24583faab1670e2093ce5f94d Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 11 May 2022 19:16:40 +0200
Subject: [PATCH] feat: improve redis support
---
mailu/Chart.yaml | 2 +-
mailu/templates/configmap-global.yaml | 2 --
mailu/templates/secret-global.yaml | 2 ++
mailu/values.yaml | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mailu/Chart.yaml b/mailu/Chart.yaml
index ef7e1a5..5362a44 100644
--- a/mailu/Chart.yaml
+++ b/mailu/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
name: mailu
description: Helm Chart for Mailu
type: application
-version: 1.3.2
+version: 1.3.3
appVersion: "1.9.26"
diff --git a/mailu/templates/configmap-global.yaml b/mailu/templates/configmap-global.yaml
index b4cf80a..2232894 100644
--- a/mailu/templates/configmap-global.yaml
+++ b/mailu/templates/configmap-global.yaml
@@ -23,8 +23,6 @@ data:
PASSWORD_SCHEME: "{{ .Values.config.passwordScheme }}"
POD_ADDRESS_RANGE: "{{ .Values.config.realIpFrom }}"
POSTMASTER: "{{ .Values.config.postmaster }}"
- QUOTA_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.quota }}"
- RATELIMIT_STORAGE_URL: "redis://{{ .Values.redis.host }}/{{ .Values.redis.databases.ratelimit }}"
REAL_IP_FROM: "{{ .Values.config.realIpFrom }}"
REAL_IP_HEADER: "{{ .Values.config.realIpHeader }}"
RECIPIENT_DELIMITER: "{{ .Values.config.recipientDelimiter }}"
diff --git a/mailu/templates/secret-global.yaml b/mailu/templates/secret-global.yaml
index be05615..ef074f0 100644
--- a/mailu/templates/secret-global.yaml
+++ b/mailu/templates/secret-global.yaml
@@ -8,3 +8,5 @@ stringData:
SECRET_KEY: "{{ .Values.config.secretKey }}"
DB_PW: "{{ .Values.database.password }}"
DB_USER: "{{ .Values.database.username }}"
+ QUOTA_STORAGE_URL: "redis://redis:{{ .Values.redis.password }}@{{ .Values.redis.host }}/{{ .Values.redis.databases.quota }}"
+ RATELIMIT_STORAGE_URL: "redis://redis:{{ .Values.redis.password }}@{{ .Values.redis.host }}/{{ .Values.redis.databases.ratelimit }}"
diff --git a/mailu/values.yaml b/mailu/values.yaml
index 4d815dc..bfd6983 100644
--- a/mailu/values.yaml
+++ b/mailu/values.yaml
@@ -44,6 +44,7 @@ database:
redis:
host: "external-redis-hostname"
+ password: ""
databases:
quota: 1
ratelimit: 2
--
GitLab