add ranges to template and update Readme

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_apache)](https://jenkins.confdroid.com/job/confdroid_apache/)
 [![Security Hotspots](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_apache&metric=security_hotspots&token=sqb_783a19acf8d97e87e5c570981a8e9019d40c4654)](https://sonarqube.confdroid.com/dashboard?id=confdroid_apache)
-[![Quality gate](https://sonarqube.confdroid.com/api/project_badges/quality_gate?project=confdroid_apache&token=sqb_783a19acf8d97e87e5c570981a8e9019d40c4654)](https://sonarqube.confdroid.com/dashboard?id=confdroid_apache)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/grizzlycoda/puppet_collection)
 
 - [README](#readme)
   - [Synopsis](#synopsis)
@@ -45,7 +45,7 @@ Configuration
 
 Optional
 
-- manage remoteIP logging if running behind a Loadbalancer like HAproxy: if `ae_use_lb` is set to `true`, a configuration file `etc/httpd/conf.d/loadbalancer-remoteip.conf`is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set `ae_trusted_proxy`to the proper IP or range for the loadbalancer!
+- manage remoteIP logging if running behind a Loadbalancer like HAproxy: if `ae_use_lb` is set to `true`, a configuration file `etc/httpd/conf.d/loadbalancer-remoteip.conf`is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set `ae_trusted_proxy` and `ae_internal_proxy` to the proper IP or range for the loadbalancer!
 
 Maintenance
 

manifests/params.pp

@@ -30,9 +30,15 @@
 #   to apply the changes. This is required when using httpd behind a 
 #   load balancer like haproxy, otherwise all client ips will be logged 
 #   as the load balancer ip.
-# @param [String] ae_trusted_proxy the IP address of the trusted proxy, 
+# @param [Array] ae_trusted_proxy the IP addresses of the trusted proxies, 
-#   i.e. the load balancer. This is required when `ae_use_lb` is set to 
+#   i.e. the load balancers. This is required when `ae_use_lb` is set to 
-#   true, and defaults to '10.0.1.0/24'.
+#   true, and defaults to ['127.0.0.1','10.0.1.0/24'].
+# @param [Array] ae_internal_proxy the IP addresses of the internal proxies, 
+#   i.e. the internal load balancers. This is required when `ae_use_lb` is set to 
+#   true, and defaults to ['127.0.0.1'].
+# @param [String] ae_remoteip_header the header to use for the remote ip,
+#   typically `X-Forwarded-For`. This is required when `ae_use_lb` is set 
+#   to true, and defaults to `X-Forwarded-For`.
 ###########################################################################
 class confdroid_apache::params (
 
@@ -58,7 +64,9 @@ class confdroid_apache::params (
 
 # loadbalancer
   Boolean $ae_use_lb          = false,
-  String $ae_trusted_proxy    = '10.0.1.0/24',
+  Array $ae_trusted_proxy     = ['127.0.0.1','10.0.1.0/24'],
+  Array $ae_internal_proxy    = ['127.0.0.1','10.0.1.0/24'],
+  String $ae_remoteip_header  = 'X-Forwarded-For',
 
 ) {
 # facts

templates/loadbalancer/remoteip.conf.erb

@@ -3,10 +3,18 @@
 ##########      manual changes will be overwritten !!!               ##########
 ###############################################################################
 
-RemoteIPHeader X-Forwarded-For
+<IfModule remoteip_module>
-RemoteIPTrustedProxy <%= @ae_trusted_proxy %>
+    RemoteIPHeader <%= @ae_remoteip_header -%>
-RemoteIPInternalProxy <%= @ae_trusted_proxy %>
+    <% @ae_trusted_proxy.each do |proxy| %>
+    RemoteIPTrustedProxy <%= proxy -%>
+    <% end -%>
+    <% @ae_internal_proxy.each do |proxy| %>
+    RemoteIPInternalProxy <%= proxy -%>
+    <% end -%>
+
+
+    # Use real client IP in all standard log formats
+    LogFormat "%a %l %u %t \"%r\" %>s %b" common
+    LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined
+</IfModule>
 
-# mod_remoteip rewrites client address for %a; use it in common/combined logs.
-LogFormat "%a %l %u %t \"%r\" %>s %b" common
-LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined