Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ben 2020-05-17 03:43:11 +01:00
commit a8cde3ebb2

View File

@ -23,7 +23,7 @@ server {
} }
location ~ ^/(.*)/penguin/activate/(.*) { location ~ ^/(.*)/penguin/activate/(.*) {
proxy_pass http://localhost:3000/activate/vanilla/$1/$2; proxy_pass http://dash:3000/activate/vanilla/$1/$2;
proxy_redirect off; proxy_redirect off;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;