summaryrefslogtreecommitdiffstats
path: root/nginx
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2019-07-31 19:03:25 +0200
committerJohannes Löthberg <johannes@kyriasis.com>2019-07-31 19:03:25 +0200
commitae05001036d92e01f11d271d05c800ce1d3a278e (patch)
tree1583b9330d2da0b46a561371094f314fcfc4d057 /nginx
parent56d6b6e5bb1e3d6e743d6f1b17037ae2aa1d49c0 (diff)
downloadpillar-ae05001036d92e01f11d271d05c800ce1d3a278e.tar.xz
Another attempt
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'nginx')
-rw-r--r--nginx/matrix_kyriasis_com.sls7
1 files changed, 3 insertions, 4 deletions
diff --git a/nginx/matrix_kyriasis_com.sls b/nginx/matrix_kyriasis_com.sls
index cec97da..4182830 100644
--- a/nginx/matrix_kyriasis_com.sls
+++ b/nginx/matrix_kyriasis_com.sls
@@ -61,10 +61,9 @@ nginx:
- proxy_buffering: "off"
- proxy_set_header: X-Forwarded-For $remote_addr
- proxy_set_header: Host $host
- - proxy_hide_header: Access-Control-Allow-Origin
- - add_header: "'Access-Control-Allow-Origin' '*'"
- - proxy_hide_header: Access-Control-Allow-Methods
- - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
+ - "if ($sent_http_access_control_allow_origin ~ '')":
+ - add_header: "'Access-Control-Allow-Origin' '*'"
+ - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
- location /_synapse:
- proxy_pass: http://synapse_metrics