summaryrefslogtreecommitdiffstats
path: root/nginx
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2019-03-21 20:17:09 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2019-03-21 20:17:09 +0100
commit665798be7fb87176efab913c6a29191dad137b79 (patch)
tree2ec02ac67dcd6edfba74f73f74c2d3f964a3b8a3 /nginx
parent157eaf65e9dcc72c45b86e586ad32bbb1ae825c1 (diff)
downloadpillar-665798be7fb87176efab913c6a29191dad137b79.tar.xz
Apparently some synapse endpoints return CORS headers, some don't...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'nginx')
-rw-r--r--nginx/kyriasis_com.sls7
-rw-r--r--nginx/matrix_kyriasis_com.sls5
2 files changed, 5 insertions, 7 deletions
diff --git a/nginx/kyriasis_com.sls b/nginx/kyriasis_com.sls
index 099c9ea..17f80fd 100644
--- a/nginx/kyriasis_com.sls
+++ b/nginx/kyriasis_com.sls
@@ -47,9 +47,6 @@ nginx:
# http://www.gnuterrypratchett.com/
- add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
- - add_header: "'Access-Control-Allow-Origin' '*'"
- - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
-
- client_max_body_size: 128m
- error_log: /var/log/nginx/kyriasis.com.error.log
@@ -62,5 +59,7 @@ nginx:
- proxy_buffering: "off"
- proxy_set_header: X-Forwarded-For $remote_addr
- proxy_set_header: Host $host
- #
+ - add_header: "'Access-Control-Allow-Origin' '*'"
+ - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
+
# vim: ft=yaml et:
diff --git a/nginx/matrix_kyriasis_com.sls b/nginx/matrix_kyriasis_com.sls
index b98ba69..8db809c 100644
--- a/nginx/matrix_kyriasis_com.sls
+++ b/nginx/matrix_kyriasis_com.sls
@@ -51,9 +51,6 @@ nginx:
# http://www.gnuterrypratchett.com/
- add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
- - add_header: "'Access-Control-Allow-Origin' '*'"
- - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
-
- client_max_body_size: 128m
- error_log: /var/log/nginx/matrix.error.log
@@ -82,5 +79,7 @@ nginx:
- proxy_buffering: "off"
- proxy_set_header: X-Forwarded-For $remote_addr
- proxy_set_header: Host $host
+ - add_header: "'Access-Control-Allow-Origin' '*'"
+ - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
# vim: ft=yaml et: