Mercurial > repos > other > Puppet
diff modules/apache/manifests/mod/disk_cache.pp @ 36:37675581a273 puppet-3.6
Update Puppet module for Apache (pulls in concat module)
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 14 Mar 2015 20:07:04 +0000 |
| parents | 956e484adc12 |
| children | 675c1cc61eaf |
line wrap: on
line diff
--- a/modules/apache/manifests/mod/disk_cache.pp Sat Mar 14 20:01:17 2015 +0000 +++ b/modules/apache/manifests/mod/disk_cache.pp Sat Mar 14 20:07:04 2015 +0000 @@ -4,6 +4,12 @@ 'redhat' => '/var/cache/mod_proxy', 'freebsd' => '/var/cache/mod_disk_cache', } + + $mod_name = $::osfamily ? { + 'FreeBSD' => 'cache_disk', + default => 'disk_cache', + } + if $::osfamily != 'FreeBSD' { # FIXME: investigate why disk_cache was dependent on proxy # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not @@ -11,7 +17,7 @@ } Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache'] - apache::mod { 'disk_cache': } + apache::mod { $mod_name: } # Template uses $cache_proxy file { 'disk_cache.conf': ensure => file, @@ -19,6 +25,6 @@ content => template('apache/mod/disk_cache.conf.erb'), require => Exec["mkdir ${::apache::mod_dir}"], before => File[$::apache::mod_dir], - notify => Service['httpd'], + notify => Class['apache::service'], } }