diff --git a/app/matrix/lib/media-repo.libsonnet b/app/matrix/lib/media-repo.libsonnet index 90af77b7..286ffa75 100644 --- a/app/matrix/lib/media-repo.libsonnet +++ b/app/matrix/lib/media-repo.libsonnet @@ -31,12 +31,16 @@ local kube = import "../../../kube/kube.libsonnet"; repo: { bindAddress: "0.0.0.0", port: 8000, + useForwardedHost: false, }, database: { postgres: "postgres://%s:%s@%s/%s?sslmode=disable" % [cfg.db.username, cfg.db.password, cfg.db.host, cfg.db.database], }, homeservers: cfg.homeservers, admins: cfg.admins, + thumbnails: { + maxSourceBytes: 10485760 * 3, + }, datastores: [ { type: "s3", diff --git a/app/matrix/matrix.hackerspace.pl.jsonnet b/app/matrix/matrix.hackerspace.pl.jsonnet index fe6fce44..a30d722f 100644 --- a/app/matrix/matrix.hackerspace.pl.jsonnet +++ b/app/matrix/matrix.hackerspace.pl.jsonnet @@ -22,7 +22,7 @@ matrix { }, mediaRepo+: { enable: true, - route: false, + route: true, s3+: { endpoint: std.strReplace((import "secrets/plain/media-repo-matrix-ceph.json").Endpoint, "http://", ""), accessKey: (import "secrets/plain/media-repo-matrix-ceph.json").AccessKey, @@ -42,22 +42,12 @@ matrix { }, }, - // We really don't like restarting our media repository since it gets stuck - // on long fsck process of its 500G storage PVC. - // TODO(b/48) To be removed after migrating to matrix-media-repo/S3 storage + // Synapse media worker has been replaced by matrix-media-repo deployment synapse+: { mediaWorker+: { deployment+: { spec+: { - template+: { - spec+: { - containers_+: { - web+: { - image: "matrixdotorg/synapse:v1.35.1", - }, - }, - } - }, + replicas: 0, }, }, }, diff --git a/kube/kube.upstream.libsonnet b/kube/kube.upstream.libsonnet index a99841d2..1b7ac59c 100644 --- a/kube/kube.upstream.libsonnet +++ b/kube/kube.upstream.libsonnet @@ -506,7 +506,9 @@ ], replicas: 1, - assert (!$._assert) || self.replicas >= 1, + # TODO(github.com/bitnami-labs/kube-libsonnet/pull/66): update from + # upstream when merged + # assert (!$._assert) || self.replicas >= 1, }, },