Merge pull request #2453 from puppetlabs/CAT-1346_erb_to_epp_mod_directory

(CAT-1346) erb_to_epp conversion for mod directory

Author: Ramesh7

CHANGELOG.md

@@ -314,7 +314,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Added
 
-- The default disk_cache.conf.erb caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
+- The default disk_cache.conf.epp caches everything.  [#2142](https://github.com/puppetlabs/puppetlabs-apache/pull/2142) ([Pawa2NR](https://github.com/Pawa2NR))
 
 ## [v6.2.0](https://github.com/puppetlabs/puppetlabs-apache/tree/v6.2.0) - 2021-05-24
 
@@ -995,7 +995,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - (MODULES-2764) Enclose IPv6 addresses in square brackets [#1248](https://github.com/puppetlabs/puppetlabs-apache/pull/1248) ([Benedikt1992](https://github.com/Benedikt1992))
 - (MODULES-2757) Adding if around ServerName in template [#1237](https://github.com/puppetlabs/puppetlabs-apache/pull/1237) ([damonconway](https://github.com/damonconway))
 - (MODULES-2651) Default document root update for Ubuntu 14.04 and Debian 8 [#1235](https://github.com/puppetlabs/puppetlabs-apache/pull/1235) ([abednarik](https://github.com/abednarik))
-- Update mime.conf.erb to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
+- Update mime.conf.epp to support dynamic AddHandler AddType AddOutputF… [#1232](https://github.com/puppetlabs/puppetlabs-apache/pull/1232) ([prabin5](https://github.com/prabin5))
 - #2544 Allow multiple IP addresses per vhost [#1229](https://github.com/puppetlabs/puppetlabs-apache/pull/1229) ([Benedikt1992](https://github.com/Benedikt1992))
 - RewriteLock support [#1228](https://github.com/puppetlabs/puppetlabs-apache/pull/1228) ([wickedOne](https://github.com/wickedOne))
 - (MODULES-2120) Allow empty docroot [#1224](https://github.com/puppetlabs/puppetlabs-apache/pull/1224) ([DavidS](https://github.com/DavidS))

REFERENCE.md

@@ -5983,7 +5983,7 @@ Data type: `String`
 
 Path to template to use for configuring mod_rpaf.
 
-Default value: `'apache/mod/rpaf.conf.erb'`
+Default value: `'apache/mod/rpaf.conf.epp'`
 
 ### <a name="apache--mod--security"></a>`apache::mod::security`
 

manifests/mod.pp

@@ -114,13 +114,19 @@
     }
   }
 
+  $parameters = {
+    'loadfiles' => $loadfiles,
+    '_id'       => $_id,
+    '_path'     => $_path,
+  }
+
   file { $_loadfile_name:
     ensure  => file,
     path    => "${mod_dir}/${_loadfile_name}",
     owner   => 'root',
     group   => $apache::params::root_group,
     mode    => $apache::file_mode,
-    content => template('apache/mod/load.erb'),
+    content => epp('apache/mod/load.epp', $parameters),
     require => [
       Package['httpd'],
       Exec["mkdir ${mod_dir}"],

manifests/mod/alias.pp

@@ -28,12 +28,18 @@
   apache::mod { 'alias': }
 
   # Template uses $icons_path
+  $parameters = {
+    'icons_prefix'  => $icons_prefix,
+    'icons_path'    => $icons_path,
+    'icons_options' => $icons_options,
+  }
+
   if $icons_path {
     file { 'alias.conf':
       ensure  => file,
       path    => "${apache::mod_dir}/alias.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/alias.conf.erb'),
+      content => epp('apache/mod/alias.conf.epp', $parameters),
       require => Exec["mkdir ${apache::mod_dir}"],
       before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],

manifests/mod/auth_cas.pp

@@ -126,13 +126,38 @@
     group  => $apache::group,
   }
 
+  $parameters = {
+    'cas_cookie_path'           => $cas_cookie_path,
+    'cas_login_url'             => $cas_login_url,
+    'cas_validate_url'          => $cas_validate_url,
+    'cas_version'               => $cas_version,
+    'cas_debug'                 => $cas_debug,
+    'cas_certificate_path'      => $cas_certificate_path,
+    'cas_proxy_validate_url'    => $cas_proxy_validate_url,
+    'cas_validate_server'       => $cas_validate_server,
+    'cas_validate_depth'        => $cas_validate_depth,
+    'cas_root_proxied_as'       => $cas_root_proxied_as,
+    'cas_cookie_entropy'        => $cas_cookie_entropy,
+    'cas_timeout'               => $cas_timeout,
+    'cas_idle_timeout'          => $cas_idle_timeout,
+    'cas_cache_clean_interval'  => $cas_cache_clean_interval,
+    'cas_cookie_domain'         => $cas_cookie_domain,
+    'cas_cookie_http_only'      => $cas_cookie_http_only,
+    'cas_authoritative'         => $cas_authoritative,
+    'cas_sso_enabled'           => $cas_sso_enabled,
+    'cas_validate_saml'         => $cas_validate_saml,
+    'cas_attribute_prefix'      => $cas_attribute_prefix,
+    'cas_attribute_delimiter'   => $cas_attribute_delimiter,
+    'cas_scrub_request_headers' => $cas_scrub_request_headers,
+  }
+
   # Template uses
   # - All variables beginning with cas_
   file { 'auth_cas.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/auth_cas.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/auth_cas.conf.erb'),
+    content => epp('apache/mod/auth_cas.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],

manifests/mod/auth_mellon.pp

@@ -39,11 +39,21 @@
 
   # Template uses
   # - All variables beginning with mellon_
+  $parameters = {
+    'mellon_cache_size'       => $mellon_cache_size,
+    'mellon_cache_entry_size' => $mellon_cache_entry_size,
+    'mellon_lock_file'        => $mellon_lock_file,
+    'mellon_post_directory'   => $mellon_post_directory,
+    'mellon_post_ttl'         => $mellon_post_ttl,
+    'mellon_post_size'        => $mellon_post_size,
+    'mellon_post_count'       => $mellon_post_count,
+  }
+
   file { 'auth_mellon.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/auth_mellon.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/auth_mellon.conf.erb'),
+    content => epp('apache/mod/auth_mellon.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],

manifests/mod/authn_dbd.pp

@@ -45,13 +45,24 @@
     include apache::mod::authn_core
   }
 
+  $parameters = {
+    'authn_dbd_dbdriver'  => $authn_dbd_dbdriver,
+    'authn_dbd_params'    => $authn_dbd_params,
+    'authn_dbd_min'       => $authn_dbd_min,
+    'authn_dbd_max'       => $authn_dbd_max,
+    'authn_dbd_keep'      => $authn_dbd_keep,
+    'authn_dbd_exptime'   => $authn_dbd_exptime,
+    'authn_dbd_alias'     => $authn_dbd_alias,
+    'authn_dbd_query'     => $authn_dbd_query,
+  }
+
   # Template uses
   # - All variables beginning with authn_dbd
   file { 'authn_dbd.conf':
     ensure  => file,
     path    => "${apache::mod_dir}/authn_dbd.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/authn_dbd.conf.erb'),
+    content => epp('apache/mod/authn_dbd.conf.epp', $parameters),
     require => [Exec["mkdir ${apache::mod_dir}"],],
     before  => File[$apache::mod_dir],
     notify  => Class['Apache::Service'],

manifests/mod/authnz_ldap.pp

@@ -25,7 +25,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/authnz_ldap.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/authnz_ldap.conf.erb'),
+    content => epp('apache/mod/authnz_ldap.conf.epp', { 'verify_server_cert' => $verify_server_cert, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],

manifests/mod/autoindex.pp

@@ -12,7 +12,7 @@
   include apache
   ::apache::mod { 'autoindex': }
 
-  # Determine icon filename suffix for autoindex.conf.erb
+  # Determine icon filename suffix for autoindex.conf.epp
   case $facts['os']['name'] {
     'Debian', 'Ubuntu': {
       $icon_suffix = '-20x22'
@@ -26,7 +26,7 @@
     ensure  => file,
     path    => "${apache::mod_dir}/autoindex.conf",
     mode    => $apache::file_mode,
-    content => template('apache/mod/autoindex.conf.erb'),
+    content => epp('apache/mod/autoindex.conf.epp', { 'icons_prefix' => $icons_prefix, 'icon_suffix' => $icon_suffix, }),
     require => Exec["mkdir ${apache::mod_dir}"],
     before  => File[$apache::mod_dir],
     notify  => Class['apache::service'],

manifests/mod/cgid.pp

@@ -38,7 +38,7 @@
       ensure  => file,
       path    => "${apache::mod_dir}/cgid.conf",
       mode    => $apache::file_mode,
-      content => template('apache/mod/cgid.conf.erb'),
+      content => epp('apache/mod/cgid.conf.epp', { 'cgisock_path' => $cgisock_path }),
       require => Exec["mkdir ${apache::mod_dir}"],
       before  => File[$apache::mod_dir],
       notify  => Class['apache::service'],