Merge branch 'master' into master

roles/custom/matrix-dendrite/defaults/main.yml

@@ -212,6 +212,9 @@ matrix_dendrite_userapi_auto_join_rooms: []
 # name, number of active users and some information on your deployment config.
 matrix_dendrite_report_stats: false
 
-# dynamically generate thumbnails for media content
+# Contorls whether thumbnails for media content are generated dynamically
 matrix_dendrite_mediaapi_dynamic_thumbnails: false
 matrix_dendrite_mediaapi_max_thumbnail_generators: 10
+
+# Controls whether the full-text search engine is enabled
+matrix_dendrite_syncapi_search_enabled: false

roles/custom/matrix-dendrite/templates/dendrite/dendrite.yaml.j2

@@ -355,7 +355,7 @@ sync_api:
   # Configuration for the full-text search engine.
   search:
     # Whether or not search is enabled.
-    enabled: false
+    enabled: {{ matrix_dendrite_syncapi_search_enabled|to_json }}
     # The path where the search index will be created in.
     index_path: "/matrix-media-store-parent/searchindex"
     # The language most likely to be used on the server - used when indexing, to