Merge branch 'main' into develop

Author: cableman

.docker/nginx.conf

@@ -18,7 +18,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 = /favicon.ico {
         log_not_found off;
         access_log off;

.docker/vhost.conf

@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- DevOps: Update docker setup to ensure real IPs in logs
+
 ## [1.2.0]
 
 - [PR-366](https://github.com/itk-dev/os2loop/pull/366)