From 237e2c832b011fa373861efbde8bfd83b10629a8 Mon Sep 17 00:00:00 2001
From: vdietrich <valentin.dietrich@lambda-online.de>
Date: Wed, 4 Jun 2025 16:59:58 +0200
Subject: [PATCH] user directory env vars

---
 .env.sample          | 7 +++++++
 abra.sh              | 2 +-
 compose.yml          | 4 ++++
 homeserver.yaml.tmpl | 7 ++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.env.sample b/.env.sample
index 4cffa95..503b632 100644
--- a/.env.sample
+++ b/.env.sample
@@ -126,6 +126,13 @@ RETENTION_MAX_LIFETIME=4w
 #SMTP_USER=
 #SECRET_SMTP_PASSWORD_VERSION=v1
 
+## USER-DIRECTORY
+
+#USER_DIRECTORY_ENABLED=true
+#USER_DIRECTORY_SEARCH_ALL_USERS=true
+#USER_DIRECTORY_PREFER_LOCAL_USERS=true
+#USER_DIRECTORY_SHOW_LOCKED_USERS=false
+
 ## App services
 
 #APP_SERVICES_ENABLED=1
diff --git a/abra.sh b/abra.sh
index f7e3a93..76f9495 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,6 +1,6 @@
 export DISCORD_BRIDGE_YAML_VERSION=v2
 export ENTRYPOINT_CONF_VERSION=v3
-export HOMESERVER_YAML_VERSION=v30
+export HOMESERVER_YAML_VERSION=v31
 export LOG_CONFIG_VERSION=v2
 export SHARED_SECRET_AUTH_VERSION=v2
 export SIGNAL_BRIDGE_YAML_VERSION=v6
diff --git a/compose.yml b/compose.yml
index 0ddd2ac..b9ef688 100644
--- a/compose.yml
+++ b/compose.yml
@@ -55,6 +55,10 @@ services:
       - ENABLE_REGISTRATION
       - REGISTRATION_REQUIRES_TOKEN
       - ENCRYPTED_BY_DEFAULT
+      - USER_DIRECTORY_ENABLED=${USER_DIRECTORY_ENABLED:-true}
+      - USER_DIRECTORY_SEARCH_ALL_USERS=${USER_DIRECTORY_SEARCH_ALL_USERS:-true}
+      - USER_DIRECTORY_PREFER_LOCAL_USERS=${USER_DIRECTORY_PREFER_LOCAL_USERS:-true}
+      - USER_DIRECTORY_SHOW_LOCKED_USERS=${USER_DIRECTORY_SHOW_LOCKED_USERS:-false}
       - FEDERATION_ALLOWLIST
       - LETSENCRYPT_HOST=${DOMAIN}
       - MEDIA_RETENTION_LOCAL_LIFETIME
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 9e40d9f..214cc48 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -248,9 +248,10 @@ encryption_enabled_by_default_for_room_type: {{ env "ENCRYPTED_BY_DEFAULT" }}
 
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#user_directory
 user_directory:
-  enabled: true
-  search_all_users: true
-  prefer_local_users: true
+  enabled: {{ env "USER_DIRECTORY_ENABLED" }}
+  search_all_users: {{ env "USER_DIRECTORY_SEARCH_ALL_USERS" }}
+  prefer_local_users: {{ env "USER_DIRECTORY_PREFER_LOCAL_USERS" }}
+  show_locked_users: {{ env "USER_DIRECTORY_SHOW_LOCKED_USERS" }}
 
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#media_retention
 media_retention: