CAT-1347 ssl reverted spacing

Author: Dinesh Gujar

CHANGELOG.md

@@ -664,7 +664,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
-- Actually create CASScrubRequestHeaders setting in _auth_cas.epp [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
+- Actually create CASScrubRequestHeaders setting in _auth_cas.erb [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
 - Fix typos [#1728](https://github.com/puppetlabs/puppetlabs-apache/pull/1728) ([hfm](https://github.com/hfm))
 - [MODULES-5644] Package name is libapache2-mpm-itk for Debian 9 [#1724](https://github.com/puppetlabs/puppetlabs-apache/pull/1724) ([zivis](https://github.com/zivis))
 - Fix case of setting apache::mpm_module to false [#1720](https://github.com/puppetlabs/puppetlabs-apache/pull/1720) ([edestecd](https://github.com/edestecd))

templates/vhost/_ssl.erb

@@ -1,4 +1,4 @@
-<%- if @ssl -%>
+<% if @ssl -%>
 
   ## SSL directives
   SSLEngine on
@@ -7,62 +7,62 @@
   SSLCertificateKeyFile   "<%= @ssl_key %>"
   <%- end -%>
   <%- if @ssl_chain -%>
-    SSLCertificateChainFile "<%= @ssl_chain %>"
+  SSLCertificateChainFile "<%= @ssl_chain %>"
   <%- end -%>
   <%- if @ssl_protocol -%>
   SSLProtocol             <%= [@ssl_protocol].flatten.compact.join(' ') %>
   <%- end -%>
   <%- if @ssl_cipher -%>
     <%- if @ssl_cipher.kind_of?(String) -%>
-      SSLCipherSuite          <%= @ssl_cipher %>
+  SSLCipherSuite          <%= @ssl_cipher %>
     <%- elsif @ssl_cipher.kind_of?(Hash) -%>
       <%- @ssl_cipher.map do |protocol, cipher| -%>
-        SSLCipherSuite <%= protocol %> <%= cipher%>
+  SSLCipherSuite <%= protocol %> <%= cipher%>
       <%- end -%>
     <%- else -%>
-      SSLCipherSuite          <%= @ssl_cipher.flatten.compact.join(':') %>
+  SSLCipherSuite          <%= @ssl_cipher.flatten.compact.join(':') %>
     <%- end -%>
   <%- end -%>
   <%- if not @ssl_honorcipherorder.nil? -%>
-    SSLHonorCipherOrder     <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
+  SSLHonorCipherOrder     <%= scope.call_function('apache::bool2httpd', [@_ssl_honorcipherorder]) %>
   <%- end -%>
   <%- if @ssl_verify_client -%>
-    SSLVerifyClient         <%= @ssl_verify_client %>
-    <%- if @ssl_verify_depth -%>
-      SSLVerifyDepth          <%= @ssl_verify_depth %>
-    <%- end -%>
+  SSLVerifyClient         <%= @ssl_verify_client %>
+  <%- if @ssl_verify_depth -%>
+  SSLVerifyDepth          <%= @ssl_verify_depth %>
+  <%- end -%>
   <%- end -%>
   <%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
-    SSLCACertificatePath    "<%= @ssl_certs_dir %>"
+  SSLCACertificatePath    "<%= @ssl_certs_dir %>"
   <%- end -%>
   <%- if @ssl_ca -%>
-    SSLCACertificateFile    "<%= @ssl_ca %>"
+  SSLCACertificateFile    "<%= @ssl_ca %>"
   <%- end -%>
   <%- if @ssl_crl_path -%>
-    SSLCARevocationPath     "<%= @ssl_crl_path %>"
+  SSLCARevocationPath     "<%= @ssl_crl_path %>"
   <%- end -%>
   <%- if @ssl_crl -%>
-    SSLCARevocationFile     "<%= @ssl_crl %>"
+  SSLCARevocationFile     "<%= @ssl_crl %>"
   <%- end -%>
   <%- if @ssl_crl_check -%>
-    SSLCARevocationCheck    <%= @ssl_crl_check %>
+  SSLCARevocationCheck    <%= @ssl_crl_check %>
   <%- end -%>
   <%- if @ssl_options -%>
-    SSLOptions <%= Array(@ssl_options).join(' ') %>
+  SSLOptions <%= Array(@ssl_options).join(' ') %>
   <%- end -%>
   <%- if @ssl_openssl_conf_cmd -%>
-    SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
+  SSLOpenSSLConfCmd       <%= @ssl_openssl_conf_cmd %>
   <%- end -%>
   <%- unless @ssl_stapling.nil? -%>
-    SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
+  SSLUseStapling <%= scope.call_function('apache::bool2httpd', [@ssl_stapling]) %>
   <%- end -%>
   <%- if @ssl_stapling_timeout -%>
-    SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
+  SSLStaplingResponderTimeout <%= @ssl_stapling_timeout %>
   <%- end -%>
   <%- unless @ssl_stapling_return_errors.nil? -%>
-    SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
+  SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   <%- if @ssl_user_name -%>
-    SSLUserName             <%= @ssl_user_name %>
+  SSLUserName             <%= @ssl_user_name %>
   <%- end -%>
-<%- end -%>
+<% end -%>