Suggestions from Code Review

Co-authored-by: Romain Tartière <romain@blogreen.org>

Author: 2 people

manifests/mod/cache.pp

@@ -25,16 +25,16 @@
 # @see https://httpd.apache.org/docs/current/mod/mod_cache.html for additional documentation.
 #
 class apache::mod::cache (
-  Optional[String] $cache_ignore_headers                               = undef,
-  Optional[Integer] $cache_default_expire                              = undef,
-  Optional[Integer] $cache_max_expire                                  = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+  Array[String[1]] $cache_ignore_headers              = [],
+  Optional[Integer] $cache_default_expire             = undef,
+  Optional[Integer] $cache_max_expire                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
+  Optional[Apache::OnOff] $cache_header               = undef,
+  Optional[Apache::OnOff] $cache_lock                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_cache_control = undef,
 ) {
   include apache
-  ::apache::mod { 'cache': }
+  apache::mod { 'cache': }
 
   $_configuration_file_name = 'cache.conf'
 

manifests/mod/cache_disk.pp

@@ -37,7 +37,7 @@
 # @see https://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html for additional documentation on version 2.4.
 #
 class apache::mod::cache_disk (
-  Optional[String] $cache_root              = undef,
+  Optional[Stdlib::Absolutepath] $cache_root              = undef,
   Array[String] $cache_enable               = [],
   Optional[Integer] $cache_dir_length       = undef,
   Optional[Integer] $cache_dir_levels       = undef,

manifests/mod/disk_cache.pp

@@ -26,7 +26,7 @@
   Optional[String] $cache_ignore_headers     = undef,
   Boolean $default_cache_enable              = true,
 ) {
-  deprecation('apache::mod::disk_cache', 'This module is deprecated; please use apache::mod::cache_disk')
+  deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,

templates/mod/cache.conf.epp

@@ -1,11 +1,11 @@
 <% |
-  Optional[String] $cache_ignore_headers                               = undef,
-  Optional[Integer] $cache_default_expire                              = undef,
-  Optional[Integer] $cache_max_expire                                  = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_no_lastmod    = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_header               = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_lock                 = undef,
-  Optional[Enum['off', 'on', 'Off', 'On']] $cache_ignore_cache_control = undef,
+  Optional[String] $cache_ignore_headers              = undef,
+  Optional[Integer] $cache_default_expire             = undef,
+  Optional[Integer] $cache_max_expire                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
+  Optional[Apache::OnOff] $cache_header               = undef,
+  Optional[Apache::OnOff] $cache_lock                 = undef,
+  Optional[Apache::OnOff] $cache_ignore_cache_control = undef,
 | -%>
 <%- if $cache_default_expire { -%>
 CacheDefaultExpire <%= $cache_default_expire %>
@@ -27,4 +27,4 @@ CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
 CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>
+<%- } -%>

templates/mod/cache_disk.conf.epp

@@ -23,4 +23,4 @@ CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
 CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>
+<%- } -%>