diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp index abd46ddd..9d8c5e20 100644 --- a/manifests/mod/disk_cache.pp +++ b/manifests/mod/disk_cache.pp @@ -1,62 +1,63 @@ # @summary # Installs and configures `mod_disk_cache`. # # @param cache_root # Defines the name of the directory on the disk to contain cache files. # Default depends on the Apache version and operating system: # - Debian: /var/cache/apache2/mod_cache_disk # - FreeBSD: /var/cache/mod_cache_disk # - Red Hat, Apache 2.4: /var/cache/httpd/proxy # - Red Hat, Apache 2.2: /var/cache/mod_proxy # # @param cache_ignore_headers # Specifies HTTP header(s) that should not be stored in the cache. # # @note # Apache 2.2, mod_disk_cache installed. On Apache 2.4, mod_cache_disk installed. # # @see https://httpd.apache.org/docs/2.2/mod/mod_disk_cache.html for additional documentation. # class apache::mod::disk_cache ( $cache_root = undef, $cache_ignore_headers = undef, + $default_cache_enable = true, ) { include apache if $cache_root { $_cache_root = $cache_root } elsif versioncmp($apache::apache_version, '2.4') >= 0 { $_cache_root = $::osfamily ? { 'debian' => '/var/cache/apache2/mod_cache_disk', 'redhat' => '/var/cache/httpd/proxy', 'freebsd' => '/var/cache/mod_cache_disk', } } else { $_cache_root = $::osfamily ? { 'debian' => '/var/cache/apache2/mod_disk_cache', 'redhat' => '/var/cache/mod_proxy', 'freebsd' => '/var/cache/mod_disk_cache', } } if versioncmp($apache::apache_version, '2.4') >= 0 { apache::mod { 'cache_disk': } } else { apache::mod { 'disk_cache': } } Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache'] # Template uses $_cache_root file { 'disk_cache.conf': ensure => file, path => "${apache::mod_dir}/disk_cache.conf", mode => $apache::file_mode, content => template('apache/mod/disk_cache.conf.erb'), require => Exec["mkdir ${apache::mod_dir}"], before => File[$apache::mod_dir], notify => Class['apache::service'], } } diff --git a/templates/mod/disk_cache.conf.erb b/templates/mod/disk_cache.conf.erb index 44d4fd2b..c97ee766 100644 --- a/templates/mod/disk_cache.conf.erb +++ b/templates/mod/disk_cache.conf.erb @@ -1,7 +1,9 @@ +<% if @default_cache_enable -%> CacheEnable disk / +<% end -%> CacheRoot "<%= @_cache_root %>" CacheDirLevels 2 CacheDirLength 1 <% if @cache_ignore_headers -%> CacheIgnoreHeaders <%= @cache_ignore_headers -%> <% end -%> \ No newline at end of file