It worked without it too, but doing this is more consistent with the mxisd recommendations.pull/84/head
| @@ -119,7 +119,7 @@ matrix_mxisd_synapsesql_type: postgresql | |||||
| matrix_mxisd_synapsesql_connection: //{{ matrix_synapse_database_host }}/{{ matrix_synapse_database_database }}?user={{ matrix_synapse_database_user }}&password={{ matrix_synapse_database_password }} | matrix_mxisd_synapsesql_connection: //{{ matrix_synapse_database_host }}/{{ matrix_synapse_database_database }}?user={{ matrix_synapse_database_user }}&password={{ matrix_synapse_database_password }} | ||||
| matrix_mxisd_dns_overwrite_enabled: true | matrix_mxisd_dns_overwrite_enabled: true | ||||
| matrix_mxisd_dns_overwrite_homeserver_client_name: "matrix-mxisd" | |||||
| matrix_mxisd_dns_overwrite_homeserver_client_name: "{{ hostname_matrix }}" | |||||
| matrix_mxisd_dns_overwrite_homeserver_client_value: "http://{{ 'matrix-corporal:41080' if matrix_corporal_enabled else 'matrix-synapse:8008' }}" | matrix_mxisd_dns_overwrite_homeserver_client_value: "http://{{ 'matrix-corporal:41080' if matrix_corporal_enabled else 'matrix-synapse:8008' }}" | ||||
| # By default, we send mail through the `matrix-mailer` service. | # By default, we send mail through the `matrix-mailer` service. | ||||
| @@ -40,7 +40,7 @@ matrix_mxisd_threepid_medium_email_connectors_smtp_password: "" | |||||
| # Useful when reverse-proxying certain URLs (e.g. `/_matrix/client/r0/user_directory/search`) to mxisd, | # Useful when reverse-proxying certain URLs (e.g. `/_matrix/client/r0/user_directory/search`) to mxisd, | ||||
| # so that mxisd can rewrite the original URL to one that would reach the homeserver. | # so that mxisd can rewrite the original URL to one that would reach the homeserver. | ||||
| matrix_mxisd_dns_overwrite_enabled: false | matrix_mxisd_dns_overwrite_enabled: false | ||||
| matrix_mxisd_dns_overwrite_homeserver_client_name: "matrix-mxisd" | |||||
| matrix_mxisd_dns_overwrite_homeserver_client_name: "{{ hostname_matrix }}" | |||||
| matrix_mxisd_dns_overwrite_homeserver_client_value: "http://matrix-synapse:8008" | matrix_mxisd_dns_overwrite_homeserver_client_value: "http://matrix-synapse:8008" | ||||
| # Default mxisd configuration template which covers the generic use case. | # Default mxisd configuration template which covers the generic use case. | ||||
| @@ -71,6 +71,9 @@ server { | |||||
| {# Generic configuration for use outside of our container setup #} | {# Generic configuration for use outside of our container setup #} | ||||
| proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_identity_api_addr_sans_container }}; | proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_identity_api_addr_sans_container }}; | ||||
| {% endif %} | {% endif %} | ||||
| proxy_set_header Host $host; | |||||
| proxy_set_header X-Forwarded-For $remote_addr; | |||||
| } | } | ||||
| {% endif %} | {% endif %} | ||||
| @@ -85,6 +88,9 @@ server { | |||||
| {# Generic configuration for use outside of our container setup #} | {# Generic configuration for use outside of our container setup #} | ||||
| proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_sans_container }}; | proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_user_directory_search_addr_sans_container }}; | ||||
| {% endif %} | {% endif %} | ||||
| proxy_set_header Host $host; | |||||
| proxy_set_header X-Forwarded-For $remote_addr; | |||||
| } | } | ||||
| {% endif %} | {% endif %} | ||||