From 3ea7e30812073c61538435c9c2ccb5181db1bf3f Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Sat, 24 May 2025 09:11:08 +0200
Subject: [PATCH] add email_template

---
 CloudronManifest.json    | 11 ++++++++++-
 POSTINSTALL.md           |  4 ----
 homeserver.yaml.template |  4 +++-
 start.sh                 |  1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CloudronManifest.json b/CloudronManifest.json
index 9a87831..b33aa1e 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -44,8 +44,17 @@
     "https://screenshots.cloudron.io/org.matrix.synapse/2.png",
     "https://screenshots.cloudron.io/org.matrix.synapse/3.png"
   ],
+  "checklist": {
+    "configure-federation": {
+      "message": "For federation to work, the delegation URI `https://$CLOUDRON-APP-DOMAIN/.well-known/matrix/server` must be configured. See the [docs](https://docs.cloudron.io/apps/synapse/#post-installation) on how to do this."
+    },
+    "registration-enabled-without-verification": {
+      "message": "Registration is enabled but verification is disabled. See [docs](https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html?highlight=registration_require#enable_registration) for more information",
+      "sso": false
+    }
+  },
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "7.5.1",
+  "minBoxVersion": "8.2.0",
   "forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
   "documentationUrl": "https://docs.cloudron.io/apps/synapse/",
   "optionalSso": true
diff --git a/POSTINSTALL.md b/POSTINSTALL.md
index f5da42a..246636b 100644
--- a/POSTINSTALL.md
+++ b/POSTINSTALL.md
@@ -1,6 +1,2 @@
 Account ids are created with the username and the second level domain under which the
 app is installed e.g. `@$CLOUDRON-USERNAME:$CLOUDRON-APP-DOMAIN`.
-
-For federation to work, the delegation URI `https://$CLOUDRON-APP-DOMAIN/.well-known/matrix/server`
-must be configured. See the [docs](https://docs.cloudron.io/apps/synapse/#post-installation) on how to do this.
-
diff --git a/homeserver.yaml.template b/homeserver.yaml.template
index cdd5e7d..375307c 100644
--- a/homeserver.yaml.template
+++ b/homeserver.yaml.template
@@ -56,6 +56,8 @@ turn_allow_guests: true
 
 # sso (https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#single-sign-on-integration)
 enable_registration: false
+# without this, registration requires one of email/captcha/token verification
+enable_registration_without_verification: true
 
 oidc_providers:
   - idp_id: cloudron
@@ -74,7 +76,7 @@ oidc_providers:
       config:
         localpart_template: "{{ user.sub }}"
         display_name_template: "{{ user.name }}"
-        email_template: "{{ '{{ user.email }}' }}"
+        email_template: "{{ user.email }}"
 
 password_config:
     enabled: false
diff --git a/start.sh b/start.sh
index 002d4c4..e84d8d0 100755
--- a/start.sh
+++ b/start.sh
@@ -85,6 +85,7 @@ if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
     yq eval -i ".oidc_providers[0].skip_verification=true" /app/data/configs/homeserver.yaml
     yq eval -i ".oidc_providers[0].user_mapping_provider.config.localpart_template=\"{{ user.sub }}\"" /app/data/configs/homeserver.yaml
     yq eval -i ".oidc_providers[0].user_mapping_provider.config.display_name_template=\"{{ user.name }}\"" /app/data/configs/homeserver.yaml
+    yq eval -i ".oidc_providers[0].user_mapping_provider.config.email_template=\"{{ user.email }}\"" /app/data/configs/homeserver.yaml
 else
     yq eval -i ".password_config.localdb_enabled=true" /app/data/configs/homeserver.yaml
 fi