From 8b9c8f9a03595ef6cbf74284d3f937e8458ad3c7 Mon Sep 17 00:00:00 2001 From: Piotr Dobrowolski Date: Wed, 15 Sep 2021 21:27:42 +0200 Subject: [PATCH] app/matrix/matrix.hackerspace.pl: deploy matrix-media-repo Change-Id: If80335595190cf2e22cc2ef5d5f305b70e09d5d7 Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1142 Reviewed-by: q3k --- app/matrix/matrix.hackerspace.pl.jsonnet | 14 ++++++ .../cipher/media-repo-matrix-ceph.json | 43 +++++++++++++++++++ .../secrets/cipher/media-repo-matrix-postgres | 40 +++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 app/matrix/secrets/cipher/media-repo-matrix-ceph.json create mode 100644 app/matrix/secrets/cipher/media-repo-matrix-postgres diff --git a/app/matrix/matrix.hackerspace.pl.jsonnet b/app/matrix/matrix.hackerspace.pl.jsonnet index fa5937e2..fe6fce44 100644 --- a/app/matrix/matrix.hackerspace.pl.jsonnet +++ b/app/matrix/matrix.hackerspace.pl.jsonnet @@ -20,6 +20,20 @@ matrix { client_auth_method: "client_secret_post", }, }, + mediaRepo+: { + enable: true, + route: false, + s3+: { + endpoint: std.strReplace((import "secrets/plain/media-repo-matrix-ceph.json").Endpoint, "http://", ""), + accessKey: (import "secrets/plain/media-repo-matrix-ceph.json").AccessKey, + secretKey: (import "secrets/plain/media-repo-matrix-ceph.json").SecretKey, + bucketName: "media-repo-matrix", + region: "eu", + }, + db+: { + password: std.strReplace(importstr "secrets/plain/media-repo-matrix-postgres", "\n", ""), + }, + }, }, riot+: { diff --git a/app/matrix/secrets/cipher/media-repo-matrix-ceph.json b/app/matrix/secrets/cipher/media-repo-matrix-ceph.json new file mode 100644 index 00000000..fe8378c2 --- /dev/null +++ b/app/matrix/secrets/cipher/media-repo-matrix-ceph.json @@ -0,0 +1,43 @@ +-----BEGIN PGP MESSAGE----- + +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 +FtNXyBj7I1zX33/FSB//rCP7EApM +=h+xK +-----END PGP MESSAGE----- diff --git a/app/matrix/secrets/cipher/media-repo-matrix-postgres b/app/matrix/secrets/cipher/media-repo-matrix-postgres new file mode 100644 index 00000000..97c6328f --- /dev/null +++ b/app/matrix/secrets/cipher/media-repo-matrix-postgres @@ -0,0 +1,40 @@ +-----BEGIN PGP MESSAGE----- + +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 +=cpiF +-----END PGP MESSAGE-----