finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #245 from dreamflasher/patch-1

Browse Source 
missing Map /.well-known/matrix/server for server discovery
This commit is contained in:
Slavi Pantaleev 2019-08-16 10:00:43 +03:00 committed by GitHub
commit fe3f523853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/apache/matrix-synapse.conf
View File

@ -34,6 +34,7 @@
# Keep some URIs free for different proxy/location # Keep some URIs free for different proxy/location
ProxyPassMatch ^/.well-known/matrix/client ! ProxyPassMatch ^/.well-known/matrix/client !
ProxyPassMatch ^/.well-known/matrix/server !
ProxyPassMatch ^/_matrix/identity ! ProxyPassMatch ^/_matrix/identity !
ProxyPassMatch ^/_matrix/client/r0/user_directory/search ! ProxyPassMatch ^/_matrix/client/r0/user_directory/search !
@ -46,10 +47,18 @@
<Files "/matrix/static-files/.well-known/matrix/client"> <Files "/matrix/static-files/.well-known/matrix/client">
Require all granted Require all granted
</Files> </Files>
<Location "/.well-known/matrix/client> <Location "/.well-known/matrix/client">
Header always set Content-Type "application/json" Header always set Content-Type "application/json"
Header always set Access-Control-Allow-Origin "*" Header always set Access-Control-Allow-Origin "*"
</Location> </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"
</Location>
<Directory /matrix/static-files/.well-known/matrix/> <Directory /matrix/static-files/.well-known/matrix/>
AllowOverride All AllowOverride All
# Apache 2.4: # Apache 2.4: