DevOps: Updated docker setup - fix nginx ips

Author: cableman

.docker/nginx.conf

@@ -7,7 +7,6 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     proxy_temp_path /tmp/proxy_temp;
     client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -6,6 +6,11 @@ server {
 
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
+
     location / {
         # try to serve file directly, fallback to index.php
         try_files $uri /index.php$is_args$args;

.env

@@ -1,5 +1,6 @@
 COMPOSE_PROJECT_NAME=itksites
-COMPOSE_DOMAIN=itksites.local.itkdev.dk
+#COMPOSE_DOMAIN=itksites.local.itkdev.dk
+COMPOSE_DOMAIN=sites.itkdev.dk
 
 # In all environments, the following files are loaded if they exist,
 # the latter taking precedence over the former: