diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-01-26 23:30:11 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-01-26 23:30:11 +0000 |
commit | 46c8f79cd7083e820ee0286d7a38e314423b4727 (patch) | |
tree | 933e7586b341ab463dd036d08a6f0d559377cb36 /installation | |
parent | e97864bfcbda963823a00b38af763a7c5385dafc (diff) | |
parent | 9c0c40cf1e11fb0e59dd675e867e97e6369c7b80 (diff) | |
download | pleroma-46c8f79cd7083e820ee0286d7a38e314423b4727.tar.gz |
Merge branch 'feature/cross-origin' into 'develop'
Access-Control-Allow-Origin
See merge request pleroma/pleroma!52
Diffstat (limited to 'installation')
-rw-r--r-- | installation/pleroma.nginx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 92ed8f32e..f714792da 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -22,6 +22,7 @@ server { server_name example.tld; location / { + add_header 'Access-Control-Allow-Origin' '*'; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; |