From 96686386ae6ea688133079cd4b9ef941ad9f36d5 Mon Sep 17 00:00:00 2001
From: Hugo Renard <hugo.renard@protonmail.com>
Date: Tue, 18 Apr 2023 11:43:31 +0200
Subject: [PATCH] feat(nextcloud): cleanup redis config
---
nextcloud/env.template | 3 ---
nextcloud/manifests/app.yml | 30 ++++++++++++++++++++++++
nextcloud/manifests/install-job.yml | 15 ++++++++++++
nextcloud/other-manifests/update-job.yml | 15 ++++++++++++
4 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/nextcloud/env.template b/nextcloud/env.template
index e4a508b..004e7d9 100644
--- a/nextcloud/env.template
+++ b/nextcloud/env.template
@@ -14,9 +14,6 @@ OBJECTSTORE_S3_REGION=default
OBJECTSTORE_S3_AUTOCREATE=false
OBJECTSTORE_S3_USEPATH_STYLE=true
OBJECTSTORE_S3_SSL=true
-REDIS_HOST=redis
-REDIS_HOST_PORT=6379
-REDIS_PORT=6379
MAIL_DOMAIN=liiib.re
SMTP_HOST=mail.indie.host
SMTP_PORT=587
diff --git a/nextcloud/manifests/app.yml b/nextcloud/manifests/app.yml
index 69af2ff..210ca03 100644
--- a/nextcloud/manifests/app.yml
+++ b/nextcloud/manifests/app.yml
@@ -165,6 +165,21 @@ spec:
secretKeyRef:
key: password
name: nextcloud.pg-${PG_DOMAIN}.credentials
+ - name: REDIS_HOST
+ valueFrom:
+ secretKeyRef:
+ key: host
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_HOST_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
envFrom:
- secretRef:
name: ${FQDN}-app
@@ -268,6 +283,21 @@ spec:
secretKeyRef:
key: password
name: nextcloud.pg-${PG_DOMAIN}.credentials
+ - name: REDIS_HOST
+ valueFrom:
+ secretKeyRef:
+ key: host
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_HOST_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
envFrom:
- secretRef:
name: ${FQDN}-app
diff --git a/nextcloud/manifests/install-job.yml b/nextcloud/manifests/install-job.yml
index f609a67..9be0fdb 100644
--- a/nextcloud/manifests/install-job.yml
+++ b/nextcloud/manifests/install-job.yml
@@ -59,6 +59,21 @@ spec:
secretKeyRef:
key: tls.crt
name: ${DOMAIN}-realm
+ - name: REDIS_HOST
+ valueFrom:
+ secretKeyRef:
+ key: host
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_HOST_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
envFrom:
- secretRef:
name: ${FQDN}-app
diff --git a/nextcloud/other-manifests/update-job.yml b/nextcloud/other-manifests/update-job.yml
index 76f208b..b139c4a 100644
--- a/nextcloud/other-manifests/update-job.yml
+++ b/nextcloud/other-manifests/update-job.yml
@@ -53,6 +53,21 @@ spec:
secretKeyRef:
key: password
name: nextcloud.pg-${PG_DOMAIN}.credentials
+ - name: REDIS_HOST
+ valueFrom:
+ secretKeyRef:
+ key: host
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_HOST_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
+ - name: REDIS_PORT
+ valueFrom:
+ secretKeyRef:
+ key: port
+ name: ${FQDN}-redis.redis.libre.sh
envFrom:
- secretRef:
name: ${FQDN}-app
--
GitLab