diff --git a/libre b/libre index fc0abefddc23c8cf532fa5d2ec0cde4e3355548e..a6e363bc68e746c622e225317c537d0f715ddc50 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 837d869b67148cbcea8a8c5b1ed74bbecebce665..3cfbd8b1bd668d5b6559b10469614cce7ffff5a8 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 196f438b8ea9cefe62b001189eb950a11376233b..4e806fc54ea1efb579c5ebdd1e248c4b7d2541b2 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 d16bbb8c07459625e1d8e4b203e5e6d6252b1f8c..b5db1bd5f8d978267e80673a0d833bf414d7cf66 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 b1251bf62be3d8ddc965d55a95faaba8cda32e73..025c9e641826c60244996ddb1f0069b48b4d6c7e 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