Recommit for updates in build 41

README.md

@@ -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` and `ae_internal_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`to the proper IP or range for the loadbalancer!
 
 Maintenance
 

doc/file.README.html

@@ -124,7 +124,7 @@
 
 <p>Optional</p>
 <ul><li>
-<p>manage remoteIP logging if running behind a Loadbalancer like HAproxy: if <code>ae_use_lb</code> is set to <code>true</code>, a configuration file <code>etc/httpd/conf.d/loadbalancer-remoteip.conf</code>is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set <code>ae_trusted_proxy</code> and <code>ae_internal_proxy</code> to the proper IP or range for the loadbalancer!</p>
+<p>manage remoteIP logging if running behind a Loadbalancer like HAproxy: if <code>ae_use_lb</code> is set to <code>true</code>, a configuration file <code>etc/httpd/conf.d/loadbalancer-remoteip.conf</code>is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set <code>ae_trusted_proxy</code>to the proper IP or range for the loadbalancer!</p>
 </li></ul>
 
 <p>Maintenance</p>

doc/index.html

@@ -124,7 +124,7 @@
 
 <p>Optional</p>
 <ul><li>
-<p>manage remoteIP logging if running behind a Loadbalancer like HAproxy: if <code>ae_use_lb</code> is set to <code>true</code>, a configuration file <code>etc/httpd/conf.d/loadbalancer-remoteip.conf</code>is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set <code>ae_trusted_proxy</code> and <code>ae_internal_proxy</code> to the proper IP or range for the loadbalancer!</p>
+<p>manage remoteIP logging if running behind a Loadbalancer like HAproxy: if <code>ae_use_lb</code> is set to <code>true</code>, a configuration file <code>etc/httpd/conf.d/loadbalancer-remoteip.conf</code>is created and configures apache/httpd to use the remote header. This allows proper fail2ban protection even behind the Loadbalancer. Make sure to set <code>ae_trusted_proxy</code>to the proper IP or range for the loadbalancer!</p>
 </li></ul>
 
 <p>Maintenance</p>

doc/puppet_classes/confdroid_apache_3A_3Aparams.html

@@ -350,51 +350,15 @@ inherited by all classes except defines.
         <span class='name'>ae_trusted_proxy</span>
       
       
-        <span class='type'>(<tt>Array</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>[&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;]</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the IP addresses of the trusted proxies, i.e. the load balancers. This is required when <code>ae_use_lb</code> is set to true, and defaults to [‘127.0.0.1’,‘10.0.1.0/24’].</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ae_internal_proxy</span>
-      
-      
-        <span class='type'>(<tt>Array</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>[&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;]</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the IP addresses of the internal proxies, i.e. the internal load balancers. This is required when <code>ae_use_lb</code> is set to true, and defaults to [‘127.0.0.1’].</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>ae_remoteip_header</span>
-      
-      
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;X-Forwarded-For&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;10.0.1.0/24&#39;</tt>)</em>
       
       
         &mdash;
         <div class='inline'>
-<p>the header to use for the remote ip, typically <code>X-Forwarded-For</code>. This is required when <code>ae_use_lb</code> is set to true, and defaults to <code>X-Forwarded-For</code>.</p>
+<p>the IP address of the trusted proxy, i.e. the load balancer. This is required when <code>ae_use_lb</code> is set to true, and defaults to ‘10.0.1.0/24’.</p>
 </div>
       
     </li>
@@ -410,6 +374,12 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
+37
+38
+39
+40
+41
+42
 43
 44
 45
@@ -473,18 +443,10 @@ inherited by all classes except defines.
 103
 104
 105
-106
+106</pre>
-107
-108
-109
-110
-111
-112
-113
-114</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 43</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 37</span>
 
 class confdroid_apache::params (
 
@@ -510,9 +472,7 @@ class confdroid_apache::params (
 
 # loadbalancer
   Boolean $ae_use_lb          = false,
-  Array $ae_trusted_proxy     = [&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;],
+  String $ae_trusted_proxy    = &#39;10.0.1.0/24&#39;,
-  Array $ae_internal_proxy    = [&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;],
-  String $ae_remoteip_header  = &#39;X-Forwarded-For&#39;,
 
 ) {
 # facts

manifests/params.pp

@@ -30,15 +30,9 @@
 #   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 [Array] ae_trusted_proxy the IP addresses of the trusted proxies, 
+# @param [String] ae_trusted_proxy the IP address of the trusted proxy, 
-#   i.e. the load balancers. This is required when `ae_use_lb` is set to 
+#   i.e. the load balancer. This is required when `ae_use_lb` is set to 
-#   true, and defaults to ['127.0.0.1','10.0.1.0/24'].
+#   true, and defaults to '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 (
 
@@ -64,9 +58,7 @@ class confdroid_apache::params (
 
 # loadbalancer
   Boolean $ae_use_lb          = false,
-  Array $ae_trusted_proxy     = ['127.0.0.1','10.0.1.0/24'],
+  String $ae_trusted_proxy    = '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,18 +3,10 @@
 ##########      manual changes will be overwritten !!!               ##########
 ###############################################################################
 
-<IfModule remoteip_module>
+RemoteIPHeader X-Forwarded-For
-    RemoteIPHeader <%= @ae_remoteip_header -%>
+RemoteIPTrustedProxy <%= @ae_trusted_proxy %>
-    <% @ae_trusted_proxy.each do |proxy| %>
+RemoteIPInternalProxy <%= @ae_trusted_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