Merge branch 'master' of github.com:xwiki-labs/cryptpad

This commit is contained in:
ansuz 2018-01-02 12:15:08 +01:00
commit 875035a41a

View File

@ -66,9 +66,12 @@ server {
rewrite ^/customize/(.*)$ $1 break; rewrite ^/customize/(.*)$ $1 break;
try_files /customize/$uri /customize.dist/$uri; try_files /customize/$uri /customize.dist/$uri;
} }
location = /api/config { location = /api/config {
default_type text/javascript; proxy_pass http://localhost:3000;
rewrite ^.*$ /customize/api/config break; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
} }
location ^~ /blob/ { location ^~ /blob/ {