Merge pull request #2366 from ekohl/bool2httpd

Simplify templates by reusing bool2httpd

Author: david22swan

templates/mod/authnz_ldap.conf.erb

@@ -1,5 +1 @@
-<% if @verify_server_cert == true -%>
-LDAPVerifyServerCert On
-<% else -%>
-LDAPVerifyServerCert Off
-<% end -%>
+LDAPVerifyServerCert <%= scope.call_function('apache::bool2httpd', [@verify_server_cert]) %>

templates/mod/rpaf.conf.erb

@@ -3,11 +3,7 @@ RPAFenable On
 # RPAFsethostname will, when enabled, take the incoming X-Host header and
 # update the virtual host settings accordingly. This allows to have the same
 # hostnames as in the "real" configuration for the forwarding proxy.
-<% if @sethostname -%>
-RPAFsethostname On
-<% else -%>
-RPAFsethostname Off
-<% end -%>
+RPAFsethostname <%= scope.call_function('apache::bool2httpd', [@sethostname]) %>
 # Which IPs are forwarding requests to us
 RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
 # Setting RPAFheader allows you to change the header name to parse from the

templates/vhost/_proxy.erb

@@ -1,23 +1,11 @@
 <% if @proxy_dest or @proxy_pass or @proxy_pass_match or @proxy_dest_match -%>
 
   ## Proxy rules
-<% if @proxy_requests -%>
-  ProxyRequests On
-<% else -%>
-  ProxyRequests Off
-<%- end -%>
-<%- end -%>
-<% if @proxy_preserve_host -%>
-  ProxyPreserveHost On
-<% else -%>
-  ProxyPreserveHost Off
+  ProxyRequests <%= scope.call_function('apache::bool2httpd', @proxy_requests) %>
 <%- end -%>
+  ProxyPreserveHost <%= scope.call_function('apache::bool2httpd', @proxy_preserve_host) %>
 <%- if defined?(@proxy_add_headers) -%>
-  <%- if @proxy_add_headers -%>
-  ProxyAddHeaders On
-  <%- else -%>
-  ProxyAddHeaders Off
-  <%- end -%>
+  ProxyAddHeaders <%= scope.call_function('apache::bool2httpd', @proxy_add_headers) %>
 <%- end -%>
 <% if @proxy_error_override -%>
   ProxyErrorOverride On