Merge remote-tracking branch 'origin/master' into jenkins-build-53

doc/puppet_classes/confdroid_apache_3A_3Aparams.html

@@ -377,6 +377,24 @@ inherited by all classes except defines.
         —
         <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>
+      
+      
+        &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>
 </div>
       
     </li>
@@ -392,9 +410,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-40
-41
-42
 43
 44
 45
@@ -462,10 +477,14 @@ inherited by all classes except defines.
 107
 108
 109
-110</pre>
+110
+111
+112
+113
+114</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 40</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 43</span>
 
 class confdroid_apache::params (
 
@@ -493,6 +512,7 @@ class confdroid_apache::params (
   Boolean $ae_use_lb          = false,
   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;],
+  String $ae_remoteip_header  = &#39;X-Forwarded-For&#39;,
 
 ) {
 # facts

manifests/params.pp

@@ -36,6 +36,9 @@
 # @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 (
 
@@ -63,6 +66,7 @@ class confdroid_apache::params (
   Boolean $ae_use_lb          = false,
   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

@@ -4,14 +4,15 @@
 ###############################################################################
 
 <IfModule remoteip_module>
-    RemoteIPHeader <%= @remoteip_header %>
-    <% @trusted_proxies.each do |proxy| -%>
-    RemoteIPTrustedProxy <%= proxy %>
+    RemoteIPHeader <%= @ae_remoteip_header -%>
+    <% @ae_trusted_proxy.each do |proxy| %>
+    RemoteIPTrustedProxy <%= proxy -%>
     <% end -%>
-    <% @internal_proxies.each do |proxy| -%>
-    RemoteIPInternalProxy <%= proxy %>
+    <% @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