added remoteip handling

Fixes: creativecommons/tech-support#112

Author: TimidRobot

config/creativecommons.org.conf

@@ -19,8 +19,41 @@
     # modules, e.g.
     #LogLevel debug
 
+    RemoteIPHeader X-Forwarded-For
+    # Cloudflare IPs
+    # https://support.cloudflare.com/hc/en-us/articles/360029696071
+    # IPv4: https://www.cloudflare.com/ips-v4
+    RemoteIPTrustedProxy 173.245.48.0/20
+    RemoteIPTrustedProxy 103.21.244.0/22
+    RemoteIPTrustedProxy 103.22.200.0/22
+    RemoteIPTrustedProxy 103.31.4.0/22
+    RemoteIPTrustedProxy 141.101.64.0/18
+    RemoteIPTrustedProxy 108.162.192.0/18
+    RemoteIPTrustedProxy 190.93.240.0/20
+    RemoteIPTrustedProxy 188.114.96.0/20
+    RemoteIPTrustedProxy 197.234.240.0/22
+    RemoteIPTrustedProxy 198.41.128.0/17
+    RemoteIPTrustedProxy 162.158.0.0/15
+    RemoteIPTrustedProxy 104.16.0.0/12
+    RemoteIPTrustedProxy 172.64.0.0/13
+    RemoteIPTrustedProxy 131.0.72.0/22
+    # IPv6: https://www.cloudflare.com/ips-v6
+    RemoteIPTrustedProxy 2400:cb00::/32
+    RemoteIPTrustedProxy 2606:4700::/32
+    RemoteIPTrustedProxy 2803:f800::/32
+    RemoteIPTrustedProxy 2405:b500::/32
+    RemoteIPTrustedProxy 2405:8100::/32
+    RemoteIPTrustedProxy 2a06:98c0::/29
+    RemoteIPTrustedProxy 2c0f:f248::/32
+    # lb0.productionwww.creativecommons.uk0.bigv.io
+    RemoteIPTrustedProxy 5.28.62.166/32
+    # Local Varnish
+    RemoteIPInternalProxy 127.0.0.1/32
+
+    LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" remoteip
+
     ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    CustomLog ${APACHE_LOG_DIR}/access.log remoteip
 
     # For most configuration files from conf-available/, which are
     # enabled or disabled at a global level, it is possible to
@@ -34,10 +67,6 @@
         Options +Indexes
     </Directory>
 
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-    CustomLog "/var/log/apache2/access.log" combined env=!forwarded
-
     # We're proxied through varnish, so drop idle connections quickly
     KeepAlive Off