Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 6 additions and 6 deletions
Showing only changes of commit 86930bb9c2 - Show all commits

View File

@ -9,12 +9,12 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
gzip on; #gzip on;
gzip_comp_level 5; #gzip_comp_level 5;
gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json; #gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json;
} }
#uncomment for static file server #uncomment for static file server
#location /static/ { location /static/ {
#uncomment to turn on caching #uncomment to turn on caching
#expires modified 1y; #expires modified 1y;
#access_log off; #access_log off;
@ -23,6 +23,6 @@ server {
#gzip_comp_level 5; #gzip_comp_level 5;
#gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json; #gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json;
#use project location #use project location
#alias /var/node/intval3/static/; alias /home/pi/intval3/static/;
#} }
} }