mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-24 18:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed mxc links to matrix_domain instead of matrix_server_fqn_matrix

Browse Source
This commit is contained in:
Michael Hollister 2023-12-16 16:52:04 -06:00
parent ae759bd86e
commit 805280355c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/custom/matrix-media-repo/defaults/main.yml
View File

@ -153,7 +153,7 @@ matrix_media_repo_homeservers_auto:
# This should match the server_name of your homeserver, and the Host header # This should match the server_name of your homeserver, and the Host header
# provided to the media repo. # provided to the media repo.
name: "{{ matrix_server_fqn_matrix }}" name: "{{ matrix_domain }}"
# The base URL to where the homeserver can actually be reached by MMR. # The base URL to where the homeserver can actually be reached by MMR.
csApi: "http://{{ matrix_nginx_proxy_proxy_matrix_client_api_addr_with_container }}" csApi: "http://{{ matrix_nginx_proxy_proxy_matrix_client_api_addr_with_container }}"

16
roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
View File

@ -110,7 +110,7 @@
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -136,7 +136,7 @@
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -159,7 +159,7 @@
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -180,7 +180,7 @@
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -406,7 +406,7 @@ server {
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -432,7 +432,7 @@ server {
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -455,7 +455,7 @@ server {
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
@ -476,7 +476,7 @@ server {
# Make sure this matches your homeserver in media-repo.yaml # Make sure this matches your homeserver in media-repo.yaml
# You may have to manually specify it if using delegation or the # You may have to manually specify it if using delegation or the
# incoming Host doesn't match. # incoming Host doesn't match.
proxy_set_header Host $host; proxy_set_header Host {{ matrix_domain }};
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;