From 005ce43f61a65ded4d2f56f71a39e3a5323a0c4d Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 3 Apr 2022 19:25:19 +0200
Subject: [PATCH] feat: encryption by default

See https://git.coopcloud.tech/coop-cloud/matrix-synapse/issues/22.
---
 .env.sample          | 2 ++
 abra.sh              | 2 +-
 compose.yml          | 1 +
 homeserver.yaml.tmpl | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index e437ea0..a1daca8 100644
--- a/.env.sample
+++ b/.env.sample
@@ -32,6 +32,8 @@ ENABLE_3PID_LOOKUP=true
 
 USER_IPS_MAX_AGE=1d
 
+ENCRYPTED_BY_DEFAULT=all
+
 #ENABLE_ALLOWLIST=1
 #FEDERATION_ALLOWLIST="[]"
 
diff --git a/abra.sh b/abra.sh
index f10e447..956a783 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
 export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v6
+export HOMESERVER_YAML_VERSION=v7
 export LOG_CONFIG_VERSION=v2
diff --git a/compose.yml b/compose.yml
index b884b35..fa7fccd 100644
--- a/compose.yml
+++ b/compose.yml
@@ -12,6 +12,7 @@ services:
       - macaroon_secret_key
       - form_secret
     environment:
+      - ENCRYPTED_BY_DEFAULT
       - AUTO_JOIN_ROOM
       - AUTO_JOIN_ROOM_ENABLED
       - DISABLE_FEDERATION
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 2a2d17b..0d93752 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -2316,7 +2316,7 @@ push:
 # Note that this option will only affect rooms created after it is set. It
 # will also not affect rooms created by other servers.
 #
-#encryption_enabled_by_default_for_room_type: invite
+encryption_enabled_by_default_for_room_type: {{ env "ENCRYPTED_BY_DEFAULT" }}
 
 
 # Uncomment to allow non-server-admin users to create groups on this server