aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-12-30 17:29:36 +0100
committerAlex Auvolat <alex@adnab.me>2021-12-30 17:29:36 +0100
commit2ae33755927ca1c6fa84cdf3ef2aa75ea6b7edaa (patch)
tree1d16f60abdba375033b33351cb0e4ef98a913d5d
parent004881e5ffbb63d633b2b7eb0409983f9253254c (diff)
downloadnixcfg-2ae33755927ca1c6fa84cdf3ef2aa75ea6b7edaa.tar.gz
nixcfg-2ae33755927ca1c6fa84cdf3ef2aa75ea6b7edaa.zip
Cleanup
-rw-r--r--app/im/config/homeserver.yaml38
-rw-r--r--app/im/config/litestream.yml4
-rw-r--r--app/im/secrets/synapse/s3_access_key (renamed from app/im/secrets/synapse/s3_db_access_key)0
-rw-r--r--app/im/secrets/synapse/s3_secret_key (renamed from app/im/secrets/synapse/s3_db_secret_key)0
4 files changed, 21 insertions, 21 deletions
diff --git a/app/im/config/homeserver.yaml b/app/im/config/homeserver.yaml
index 0caacfe..c54bc4e 100644
--- a/app/im/config/homeserver.yaml
+++ b/app/im/config/homeserver.yaml
@@ -952,11 +952,11 @@ media_store_path: "/data/media_store"
# your reverse proxy's config. Notably Nginx has a small max body size by default.
# See https://matrix-org.github.io/synapse/latest/reverse_proxy.html.
#
-#max_upload_size: 50M
+max_upload_size: 50M
# Maximum number of pixels that will be thumbnailed
#
-#max_image_pixels: 32M
+max_image_pixels: 32M
# Whether to generate new thumbnails on the fly to precisely match
# the resolution requested by the client. If true then whenever
@@ -964,26 +964,26 @@ media_store_path: "/data/media_store"
# generate a new thumbnail. If false the server will pick a thumbnail
# from a precalculated list.
#
-#dynamic_thumbnails: false
+dynamic_thumbnails: false
# List of thumbnails to precalculate when an image is uploaded.
#
-#thumbnail_sizes:
-# - width: 32
-# height: 32
-# method: crop
-# - width: 96
-# height: 96
-# method: crop
-# - width: 320
-# height: 240
-# method: scale
-# - width: 640
-# height: 480
-# method: scale
-# - width: 800
-# height: 600
-# method: scale
+thumbnail_sizes:
+ - width: 32
+ height: 32
+ method: crop
+ - width: 96
+ height: 96
+ method: crop
+ - width: 320
+ height: 240
+ method: scale
+ - width: 640
+ height: 480
+ method: scale
+ - width: 800
+ height: 600
+ method: scale
# Is the preview URL API enabled?
#
diff --git a/app/im/config/litestream.yml b/app/im/config/litestream.yml
index a80b41b..0f5dbd5 100644
--- a/app/im/config/litestream.yml
+++ b/app/im/config/litestream.yml
@@ -4,7 +4,7 @@ dbs:
- url: s3://synapse-db/homeserver.db
region: garage-staging
endpoint: https://garage-staging.home.adnab.me
- access-key-id: {{ key "secrets/synapse/s3_db_access_key" | trimSpace }}
- secret-access-key: {{ key "secrets/synapse/s3_db_secret_key" | trimSpace }}
+ access-key-id: {{ key "secrets/synapse/s3_access_key" | trimSpace }}
+ secret-access-key: {{ key "secrets/synapse/s3_secret_key" | trimSpace }}
force-path-style: true
sync-interval: 60s
diff --git a/app/im/secrets/synapse/s3_db_access_key b/app/im/secrets/synapse/s3_access_key
index 692dc34..692dc34 100644
--- a/app/im/secrets/synapse/s3_db_access_key
+++ b/app/im/secrets/synapse/s3_access_key
diff --git a/app/im/secrets/synapse/s3_db_secret_key b/app/im/secrets/synapse/s3_secret_key
index 8bef13c..8bef13c 100644
--- a/app/im/secrets/synapse/s3_db_secret_key
+++ b/app/im/secrets/synapse/s3_secret_key