Matrix/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-14 10:04:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2960 from mcnesium/extend-apache-config-example

Browse Source 
Update apache example for support discovery
This commit is contained in:
Slavi Pantaleev 2023-10-21 18:56:52 +03:00 committed by GitHub
commit bf53286a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,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 ^/.well-known/matrix/server !
ProxyPassMatch ^/.well-known/matrix/support !
ProxyPassMatch ^/_matrix/identity ! ProxyPassMatch ^/_matrix/identity !
ProxyPassMatch ^/_matrix/client/r0/user_directory/search ! ProxyPassMatch ^/_matrix/client/r0/user_directory/search !
@ -64,6 +65,7 @@
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 # Map /.well-known/matrix/server for server discovery
Alias /.well-known/matrix/server /matrix/static-files/.well-known/matrix/server Alias /.well-known/matrix/server /matrix/static-files/.well-known/matrix/server
<Files "/matrix/static-files/.well-known/matrix/server"> <Files "/matrix/static-files/.well-known/matrix/server">
@ -72,6 +74,16 @@
<Location "/.well-known/matrix/server"> <Location "/.well-known/matrix/server">
Header always set Content-Type "application/json" Header always set Content-Type "application/json"
</Location> </Location>
# Map /.well-known/matrix/support for support discovery
Alias /.well-known/matrix/support /matrix/static-files/.well-known/matrix/support
<Files "/matrix/static-files/.well-known/matrix/support">
Require all granted
</Files>
<Location "/.well-known/matrix/support">
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: