Merge branch 'spantaleev:master' into master

2021-05-07 23:03:55 +05:30
parent 40fe6bd5c1 61220ea487
commit bb0810302d
25 changed files with 244 additions and 104 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
@ -11,7 +11,7 @@
 	upstream generic_worker_upstream {
 		# ensures that requests from the same client will always be passed
 		# to the same server (except when this server is unavailable)
-		ip_hash;
+		hash $http_x_forwarded_for;

 		{% for worker in generic_workers %}
 			{% if matrix_nginx_proxy_enabled %}