Recommit for updates in build 43

doc/puppet_classes/confdroid_apache_3A_3Aparams.html

@@ -512,7 +512,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',
+  String $ae_remoteip_header   = 'X-Forwarded-For',
 
 ) {
 # facts

manifests/params.pp

@@ -66,7 +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',
+  String $ae_remoteip_header   = 'X-Forwarded-For',
 
 ) {
 # facts

templates/loadbalancer/remoteip.conf.erb

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