Recommit for updates in build 42

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>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> and <code>ae_internal_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>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> and <code>ae_internal_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,15 +350,33 @@ inherited by all classes except defines.
         <span class='name'>ae_trusted_proxy</span>
       
       
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>Array</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;10.0.1.0/24&#39;</tt>)</em>
+        <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 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>
+<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>
@@ -374,9 +392,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-37
-38
-39
 40
 41
 42
@@ -443,10 +458,14 @@ inherited by all classes except defines.
 103
 104
 105
-106</pre>
+106
+107
+108
+109
+110</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 37</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>
 
 class confdroid_apache::params (
 
@@ -472,7 +491,8 @@ class confdroid_apache::params (
 
 # loadbalancer
   Boolean $ae_use_lb          = false,
-  String $ae_trusted_proxy    = &#39;10.0.1.0/24&#39;,
+  Array $ae_trusted_proxy     = [&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;],
+  Array $ae_internal_proxy    = [&#39;127.0.0.1&#39;,&#39;10.0.1.0/24&#39;],
 
 ) {
 # facts