Merge pull request #1380 from borisrunakov/workers_with_own_webserver

add server_name to matrix-synapse.conf only if matrix_nginx_proxy_enabled
3 years ago · 9af010657d
parent 60bf8bef9c 6eaa8ac65a
commit 9af010657d
1 changed files with 6 additions and 2 deletions
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
@ -62,7 +62,9 @@

 server {
 	listen 12080;
-	server_name {{ matrix_nginx_proxy_proxy_synapse_hostname }};
+	{% if matrix_nginx_proxy_enabled %}
+		server_name {{ matrix_nginx_proxy_proxy_synapse_hostname }};
+	{% endif %}

 	server_tokens off;
 	root /dev/null;
@ -194,8 +196,10 @@ server {
 {% if matrix_nginx_proxy_proxy_synapse_federation_api_enabled %}
 server {
 	listen 12088;
+	{% if matrix_nginx_proxy_enabled %}
+		server_name {{ matrix_nginx_proxy_proxy_synapse_hostname }};
+	{% endif %}

-	server_name {{ matrix_nginx_proxy_proxy_synapse_hostname }};
 	server_tokens off;

 	root /dev/null;