From be1e0f30586ec45f1b5dfb6d6c1d0f2f37a4a7ac Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Wed, 13 Nov 2024 22:20:43 +0000
Subject: [PATCH] Fix default of `media_store_path`

---
 docs/usage/configuration/config_documentation.md | 2 +-
 schemas/synapse-config.schema.json               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index 534dc079a16..dfd0a866e51 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -1834,7 +1834,7 @@ enable_media_repo: false
 ---
 ### `media_store_path`
 
-*(string|null)* Directory where uploaded images and attachments are stored. Defaults to `null`.
+*(string)* Directory where uploaded images and attachments are stored. Defaults to `"media_store"`.
 
 Example configuration:
 ```yaml
diff --git a/schemas/synapse-config.schema.json b/schemas/synapse-config.schema.json
index e5b060e30e4..07dc6261ec7 100644
--- a/schemas/synapse-config.schema.json
+++ b/schemas/synapse-config.schema.json
@@ -1399,9 +1399,9 @@
       "examples": [false]
     },
     "media_store_path": {
-      "type": ["string", "null"],
+      "type": "string",
       "description": "Directory where uploaded images and attachments are stored.",
-      "default": null,
+      "default": "media_store",
       "examples": ["DATADIR/media_store"]
     },
     "max_pending_media_uploads": {