CAT-1347 resolving comments

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.erb [#1730](https://github.com/puppetlabs/puppetlabs-apache/pull/1730) ([](https://github.com/))
+- Actually create CASScrubRequestHeaders setting in _auth_cas.epp [#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/_aliases.epp

@@ -11,4 +11,4 @@
   ScriptAliasMatch <%= $alias_statement["scriptaliasmatch"] %> "<%= $alias_statement["path"] %>"
       <%- } -%>
     <%- } -%>
-  <%- } -%>
+  <%- } -%>

templates/vhost/_filters.epp

@@ -1,7 +1,7 @@
 <% unless $filters.empty {-%>
 
   ## Filter module rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_filter.html
   <%- $filters.each |$filter| {-%>
   <%= $filter %>
   <%- } -%>

templates/vhost/_http2.epp

@@ -1,22 +1,22 @@
 <% if $h2_copy_files != undef {-%>
   H2CopyFiles <%= apache::bool2httpd($h2_copy_files) %>
 <% } -%>
-<% unless $h2_direct == undef {-%>
+<% if $h2_direct != undef {-%>
   H2Direct <%= apache::bool2httpd($h2_direct) %>
 <% } -%>
 <% if $h2_early_hints != undef {-%>
   H2EarlyHints <%= apache::bool2httpd($h2_early_hints) %>
 <% } -%>
-<% unless $h2_max_session_streams == undef {-%>
+<% if $h2_max_session_streams != undef {-%>
   H2MaxSessionStreams <%= $h2_max_session_streams %>
 <% } -%>
-<%- unless $h2_modern_tls_only == undef {-%>
+<%- if $h2_modern_tls_only != undef {-%>
   H2ModernTLSOnly <%= apache::bool2httpd($h2_modern_tls_only) %>
 <%- } -%>
-<%- unless $h2_push == undef {-%>
+<%- if $h2_push != undef {-%>
   H2Push <%= apache::bool2httpd($h2_push) %>
 <%- } -%>
-<%- unless $h2_push_diary_size == undef {-%>
+<%- if $h2_push_diary_size != undef {-%>
   H2PushDiarySize <%= $h2_push_diary_size %>
 <%- } -%>
 <%- $h2_push_priority.each |$expr| {-%>
@@ -25,21 +25,21 @@
 <%- $h2_push_resource.each |$expr| {-%>
   H2PushResource <%= $expr %>
 <%- } -%>
-<% unless $h2_serialize_headers == undef  {-%>
+<% if $h2_serialize_headers != undef  {-%>
   H2SerializeHeaders <%= apache::bool2httpd($h2_serialize_headers) %>
 <% } -%>
-<% unless $h2_stream_max_mem_size == undef {-%>
+<% if $h2_stream_max_mem_size != undef {-%>
   H2StreamMaxMemSize <%= $h2_stream_max_mem_size %>
 <% } -%>
-<%- unless $h2_tls_cool_down_secs == undef {-%>
+<%- if $h2_tls_cool_down_secs != undef {-%>
   H2TLSCoolDownSecs <%= $h2_tls_cool_down_secs %>
 <%- } -%>
-<%- unless $h2_tls_warm_up_size == undef {-%>
+<%- if $h2_tls_warm_up_size != undef {-%>
   H2TLSWarmUpSize <%= $h2_tls_warm_up_size %>
 <%- } -%>
-<% unless $h2_upgrade == undef {-%>
+<% if $h2_upgrade != undef {-%>
   H2Upgrade <%= apache::bool2httpd($h2_upgrade) %>
 <% } -%>
-<% unless $h2_window_size == undef {-%>
+<% if $h2_window_size != undef {-%>
   H2WindowSize <%= $h2_window_size %>
 <% } -%>

templates/vhost/_suexec.epp

@@ -1,4 +1,4 @@
 <% if $suexec_user_group {-%>
 
 SuexecUserGroup <%= $suexec_user_group %>
-<% } -%>
+<% } -%>