From 18a23774727fb77b77534d12955de5df1677b69f Mon Sep 17 00:00:00 2001
From: Marcel Ackermann <31695+dreamflasher@users.noreply.github.com>
Date: Tue, 13 Aug 2019 20:40:04 +0200
Subject: [PATCH 1/3] missing Map /.well-known/matrix/server for server
 discovery

---
 examples/apache/matrix-synapse.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/examples/apache/matrix-synapse.conf b/examples/apache/matrix-synapse.conf
index 4f32c2ed9..a56a835b2 100644
--- a/examples/apache/matrix-synapse.conf
+++ b/examples/apache/matrix-synapse.conf
@@ -34,6 +34,7 @@
 
 	# Keep some URIs free for different proxy/location
 	ProxyPassMatch ^/.well-known/matrix/client !
+	ProxyPassMatch ^/.well-known/matrix/server !
 	ProxyPassMatch ^/_matrix/identity !
 	ProxyPassMatch ^/_matrix/client/r0/user_directory/search !
 
@@ -50,6 +51,15 @@
 		Header always set Content-Type "application/json"
 		Header always set Access-Control-Allow-Origin "*"
 	</Location>
+	# Map /.well-known/matrix/server for server discovery
+	Alias /.well-known/matrix/server /matrix/static-files/.well-known/matrix/server
+	<Files "/matrix/static-files/.well-known/matrix/server">
+		Require all granted
+	</Files>
+	<Location "/.well-known/matrix/server>
+		Header always set Content-Type "application/json"
+		Header always set Access-Control-Allow-Origin "*"
+	</Location>
 	<Directory /matrix/static-files/.well-known/matrix/>
 		AllowOverride All
 		# Apache 2.4:

From d55db2bee26c3d673880f33b42c04068f6f39ba2 Mon Sep 17 00:00:00 2001
From: Marcel Ackermann <31695+dreamflasher@users.noreply.github.com>
Date: Wed, 14 Aug 2019 08:49:06 +0200
Subject: [PATCH 2/3] quotes, simplify

---
 examples/apache/matrix-synapse.conf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/apache/matrix-synapse.conf b/examples/apache/matrix-synapse.conf
index a56a835b2..e7e36fac6 100644
--- a/examples/apache/matrix-synapse.conf
+++ b/examples/apache/matrix-synapse.conf
@@ -47,7 +47,7 @@
 	<Files "/matrix/static-files/.well-known/matrix/client">
 		Require all granted
 	</Files>
-	<Location "/.well-known/matrix/client>
+	<Location "/.well-known/matrix/client">
 		Header always set Content-Type "application/json"
 		Header always set Access-Control-Allow-Origin "*"
 	</Location>
@@ -56,10 +56,6 @@
 	<Files "/matrix/static-files/.well-known/matrix/server">
 		Require all granted
 	</Files>
-	<Location "/.well-known/matrix/server>
-		Header always set Content-Type "application/json"
-		Header always set Access-Control-Allow-Origin "*"
-	</Location>
 	<Directory /matrix/static-files/.well-known/matrix/>
 		AllowOverride All
 		# Apache 2.4:

From d675cb3d4b420a0df7f68dc6b9941837660407d8 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 16 Aug 2019 10:00:26 +0300
Subject: [PATCH 3/3] Serve /.well-known/matrix/server with proper Content-Type

---
 examples/apache/matrix-synapse.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/apache/matrix-synapse.conf b/examples/apache/matrix-synapse.conf
index e7e36fac6..7ed712ab6 100644
--- a/examples/apache/matrix-synapse.conf
+++ b/examples/apache/matrix-synapse.conf
@@ -56,6 +56,9 @@
 	<Files "/matrix/static-files/.well-known/matrix/server">
 		Require all granted
 	</Files>
+	<Location "/.well-known/matrix/server">
+		Header always set Content-Type "application/json"
+	</Location>
 	<Directory /matrix/static-files/.well-known/matrix/>
 		AllowOverride All
 		# Apache 2.4: