diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
| commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
| tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /manifests/config | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
| parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) | |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
Diffstat (limited to 'manifests/config')
| -rw-r--r-- | manifests/config/file.pp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/manifests/config/file.pp b/manifests/config/file.pp index e04b631..308da68 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -14,7 +14,7 @@ define apache::config::file( default: { fail("Wrong config file type specified for ${name}") } } $real_destination = $destination ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { centos => "${apache::centos::config_dir}/${confdir}/${name}", gentoo => "${apache::gentoo::config_dir}/${name}", debian => "${apache::debian::config_dir}/${confdir}/${name}", @@ -30,16 +30,24 @@ define apache::config::file( notify => Service[apache], owner => root, group => 0, mode => 0644; } - - case $ensure { - 'absent','purged': { - # We want to avoid all stuff related to source and content - } - 'link': { - if $target != false { - File["apache_${name}"] { - target => $target, - } + if $ensure == 'present' { + case $content { + 'absent': { + $real_source = $source ? { + 'absent' => [ + "puppet:///modules/site_apache/${confdir}/${::fqdn}/${name}", + "puppet:///modules/site_apache/${confdir}/${apache::cluster_node}/${name}", + "puppet:///modules/site_apache/${confdir}/${::operatingsystem}.${::lsbdistcodename}/${name}", + "puppet:///modules/site_apache/${confdir}/${::operatingsystem}/${name}", + "puppet:///modules/site_apache/${confdir}/${name}", + "puppet:///modules/apache/${confdir}/${::operatingsystem}.${::lsbdistcodename}/${name}", + "puppet:///modules/apache/${confdir}/${::operatingsystem}/${name}", + "puppet:///modules/apache/${confdir}/${name}" + ], + default => $source + } + File["apache_${name}"]{ + source => $real_source, } } default: { @@ -69,10 +77,11 @@ define apache::config::file( } } } + } } - case $operatingsystem { - openbsd: { info("no package dependency on ${operatingsystem} for ${name}") } + case $::operatingsystem { + openbsd: { info("no package dependency on ${::operatingsystem} for ${name}") } default: { File["apache_${name}"]{ require => Package[apache], |