Merge branch 'master' into deploy

.docker/default.conf

@@ -11,12 +11,12 @@ map $sent_http_content_type $expires {
     ~font/                     max;
 }
 
-proxy_cache_path  /tmp/nginx-cache  levels=1:2 keys_zone=STATIC:10m inactive=24h  max_size=1g;
+proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=STATIC:10m inactive=24h  max_size=64m;
 
 server {
 
     root /usr/share/nginx/html;
-    listen       80;
+    listen       8080;
     server_name  saibotk.de;
 
     access_log off;
@@ -24,6 +24,7 @@ server {
     expires $expires;
     charset UTF-8;
 
+    set_real_ip_from 10.0.0.0/8;
     set_real_ip_from 172.16.0.0/12;
 
     add_header X-Frame-Options "DENY";