From 7c226a03352ec9a6600e178233f3689ed11acd35 Mon Sep 17 00:00:00 2001
From: Diego Abelenda <diego.abelenda@camptocamp.com>
Date: Mon, 4 Dec 2017 12:50:48 +0100
Subject: [PATCH] Fix the remote client IP.

Without this, it is impossible to use "Require ip" apache restriction.
And logging is not correct.
---
 build/httpd/docker-entrypoint.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/httpd/docker-entrypoint.sh b/build/httpd/docker-entrypoint.sh
index 4ad0d715c..d8550b963 100644
--- a/build/httpd/docker-entrypoint.sh
+++ b/build/httpd/docker-entrypoint.sh
@@ -5,13 +5,13 @@ set -e
 cat > /etc/apache2/conf-available/dyn-vhost.conf <<EOF
 UseCanonicalName Off
 
-SetEnvIf X-Forwarded-For "^(.*\..*\..*\..*)|(.*:.*:.*:.*:.*:.*:.*:.*)" proxied
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
-LogFormat "%V %{X-Forwarded-For}i %l %u %t \"%r\" %s %b" vproxy
-CustomLog "| /usr/bin/rotatelogs /srv/${WP_ENV}/logs/access_log.%Y%m%d 86400" vcommon env=!proxied
-CustomLog "/dev/stdout" vcommon env=!proxied
-CustomLog "| /usr/bin/rotatelogs /srv/${WP_ENV}/logs/access_log.%Y%m%d 86400" vproxy env=proxied
-CustomLog "/dev/stdout" vproxy env=proxied
+RemoteIPHeader X-Forwarded-For
+RemoteIPInternalProxy 172.31.0.0/16 10.180.21.0/24
+
+LogFormat "%V %a %l %u %t \"%r\" %s %b %{ms}T" vcommon
+CustomLog "| /usr/bin/rotatelogs /srv/${WP_ENV}/logs/access_log.%Y%m%d 86400" vcommon
+CustomLog "/dev/stdout" vcommon
+
 ErrorLog "| /usr/bin/rotatelogs /srv/${WP_ENV}/logs/error_log.%Y%m%d 86400"
 
 VirtualDocumentRoot "/srv/${WP_ENV}/%0/htdocs"
@@ -33,6 +33,7 @@ EOF
 /usr/sbin/a2enmod ssl
 /usr/sbin/a2enmod rewrite
 /usr/sbin/a2enmod vhost_alias
+/usr/sbin/a2enmod remoteip
 /usr/sbin/a2enconf dyn-vhost
 
 /usr/sbin/apache2ctl -DFOREGROUND