summaryrefslogtreecommitdiff
path: root/installation/pleroma.nginx
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2018-01-29 17:45:44 +0100
committerRoger Braun <roger@rogerbraun.net>2018-01-29 17:45:44 +0100
commitede4883ac93b1827c8fab125125bff94c1a855db (patch)
treeb41a365018ab51567b76c20a886216c7eeb86687 /installation/pleroma.nginx
parent64e51c2cfa3e6da0f4998bab5358646cba8f29fa (diff)
parent8db83c3dc0a96f191f27df39efa91218e764bf8f (diff)
downloadpleroma-ede4883ac93b1827c8fab125125bff94c1a855db.tar.gz
pleroma-ede4883ac93b1827c8fab125125bff94c1a855db.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'installation/pleroma.nginx')
-rw-r--r--installation/pleroma.nginx1
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";