aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-04-01 08:38:31 +0000
committerlambda <pleromagit@rogerbraun.net>2018-04-01 08:38:31 +0000
commit24296047dc03cf97c2441d8d0b432aa58d333480 (patch)
tree378355627e85c6f4a8feb773533ef86d2070f2fb
parent978df55a866a8f8adaed81149287dec510e91826 (diff)
parentd8464b603ed3ef41e36d407dc4600b4350374099 (diff)
downloadpleroma-24296047dc03cf97c2441d8d0b432aa58d333480.tar.gz
Merge branch 'feature/cors' into 'develop'
web endpoint: better document CORS stuff with nginx See merge request pleroma/pleroma!82
-rw-r--r--installation/pleroma.nginx11
1 files changed, 10 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 25f6dadff..11dc6456c 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -28,7 +28,16 @@ server {
gzip_http_version 1.1;
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
location / {
- add_header 'Access-Control-Allow-Origin' '*';
+ # if you do not want remote frontends to be able to access your Pleroma backend
+ # server, remove these lines.
+ add_header 'Access-Control-Allow-Origin' '*' always;
+ add_header 'Access-Control-Allow-Methods' 'POST, GET, OPTIONS' always;
+ add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type' always;
+ if ($request_method = OPTIONS) {
+ return 204;
+ }
+ # stop removing lines here.
+
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";