From 9a64f23505e4de4cc7966d23d0cfc11267cf0fc9 Mon Sep 17 00:00:00 2001
From: Pierre Ozoux <pierre@ozoux.net>
Date: Mon, 22 Nov 2021 18:14:49 +0100
Subject: [PATCH] Adds variables to configure Objects Endpoints.
---
libre | 2 ++
nextcloud/env.template | 2 +-
nextcloud/manifests/pg.yml | 6 +++---
rocketchat/manifests/app.yml | 2 +-
rocketchat/manifests/mongo.yml | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/libre b/libre
index fc0abef..a6e363b 100755
--- a/libre
+++ b/libre
@@ -8,6 +8,8 @@ export PG_DOMAIN=$NS
export EPOCH=`date "+%s"`
export NUAGE_URL=`kubectl -n $NS get ing -o custom-columns=HOST:spec.rules[*].host --selector=app.kubernetes.io/name=nextcloud --no-headers=true`
export BUCKET=${FQDN}
+export S3_ENDPOINT=https://s3.standard.indie.host
+export S3_ENDPOINT_COLD=https://minio.k7.indie.host
export S3_SECRET=${NS}-dumps
diff --git a/nextcloud/env.template b/nextcloud/env.template
index 837d869..3cfbd8b 100644
--- a/nextcloud/env.template
+++ b/nextcloud/env.template
@@ -8,7 +8,7 @@ DB_PORT=5432
DB_TYPE=pgsql
DB_USER=nextcloud
NEXTCLOUD_ADMIN_USER=admin
-OBJECTSTORE_S3_HOST=s3.standard.indie.host
+OBJECTSTORE_S3_HOST=hot-objects.liiib.re
OBJECTSTORE_S3_PORT=443
OBJECTSTORE_S3_REGION=default
OBJECTSTORE_S3_AUTOCREATE=false
diff --git a/nextcloud/manifests/pg.yml b/nextcloud/manifests/pg.yml
index 196f438..4e806fc 100644
--- a/nextcloud/manifests/pg.yml
+++ b/nextcloud/manifests/pg.yml
@@ -25,8 +25,8 @@ data:
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_S3_FORCE_PATH_STYLE: "true"
WAL_S3_BUCKET: ${NS}-dumps
- AWS_ENDPOINT: https://minio.k7.indie.host
- WAL_S3_ENDPOINT: https://minio.k7.indie.host
+ AWS_ENDPOINT: ${S3_ENDPOINT_COLD}
+ WAL_S3_ENDPOINT: ${S3_ENDPOINT_COLD}
AWS_REGION: default
USE_WALE: "true"
USE_WALG_BACKUP: "true"
@@ -105,7 +105,7 @@ spec:
- name: LOGICAL_BACKUP_S3_BUCKET
value: ${NS}-dumps
- name: LOGICAL_BACKUP_S3_ENDPOINT
- value: https://minio.k7.indie.host
+ value: ${S3_ENDPOINT_COLD}
- name: LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX
value: "/nextcloud"
- name: LOGICAL_BACKUP_S3_REGION
diff --git a/rocketchat/manifests/app.yml b/rocketchat/manifests/app.yml
index d16bbb8..b5db1bd 100644
--- a/rocketchat/manifests/app.yml
+++ b/rocketchat/manifests/app.yml
@@ -215,7 +215,7 @@ data:
OVERWRITE_SETTING_SMTP_IgnoreTLS: 'false'
# S3
OVERWRITE_SETTING_FileUpload_S3_Bucket: ${BUCKET}
- OVERWRITE_SETTING_FileUpload_S3_BucketURL: https://s3.standard.indie.host
+ OVERWRITE_SETTING_FileUpload_S3_BucketURL: ${S3_ENDPOINT}
OVERWRITE_SETTING_FileUpload_S3_ForcePathStyle: 'true'
OVERWRITE_SETTING_FileUpload_S3_Region: default
OVERWRITE_SETTING_FileUpload_Storage_Type: AmazonS3
diff --git a/rocketchat/manifests/mongo.yml b/rocketchat/manifests/mongo.yml
index b1251bf..025c9e6 100644
--- a/rocketchat/manifests/mongo.yml
+++ b/rocketchat/manifests/mongo.yml
@@ -91,7 +91,7 @@ spec:
bucket: ${DOMAIN}-dumps
credentialsSecret: ${DOMAIN}-dumps
region: default
- endpointUrl: https://minio.k7.indie.host/
+ endpointUrl: ${S3_ENDPOINT_COLD}
prefix: mongodb
tasks:
- name: daily
--
GitLab