diff options
| author | mh <mh@immerda.ch> | 2009-02-22 21:21:52 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-02-22 21:21:52 +0000 |
| commit | 939a7583ebc7d2c023d894c2e3696d3f277ac035 (patch) | |
| tree | b266712b947373409069bc50c272d8bf74bb11a9 /manifests/defines | |
| parent | 42394217259115dd89547d36acb3fea83d0bb8af (diff) | |
for the config file a content can be supplied now as well
Diffstat (limited to 'manifests/defines')
| -rw-r--r-- | manifests/defines/configuration.pp | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/manifests/defines/configuration.pp b/manifests/defines/configuration.pp index 483d8e6..8911c07 100644 --- a/manifests/defines/configuration.pp +++ b/manifests/defines/configuration.pp @@ -5,21 +5,9 @@ # deploy apache (.conf) configuration file (non-vhost) define apache::config::file( $source = '', + $content = 'absent', $destination = '' ){ - $real_source = $source ? { - '' => [ - "puppet://$server/files/apache/conf.d/${fqdn}/${name}", - "puppet://$server/files/apache/conf.d/${apache_cluster_node}/${name}", - "puppet://$server/files/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet://$server/files/apache/conf.d/${operatingsystem}/${name}", - "puppet://$server/files/apache/conf.d/${name}", - "puppet://$server/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet://$server/apache/conf.d/${operatingsystem}/${name}", - "puppet://$server/apache/conf.d/${name}" - ], - default => "puppet://$server/$source", - } $real_destination = $destination ? { '' => $operatingsystem ? { centos => "$apache::centos::config_dir/conf.d/${name}", @@ -33,10 +21,34 @@ define apache::config::file( } file{"apache_${name}": path => $real_destination, - source => $real_source, notify => Service[apache], owner => root, group => 0, mode => 0644; } + case $content { + 'absent': { + $real_source = $source ? { + '' => [ + "puppet://$server/files/apache/conf.d/${fqdn}/${name}", + "puppet://$server/files/apache/conf.d/${apache_cluster_node}/${name}", + "puppet://$server/files/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet://$server/files/apache/conf.d/${operatingsystem}/${name}", + "puppet://$server/files/apache/conf.d/${name}", + "puppet://$server/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet://$server/apache/conf.d/${operatingsystem}/${name}", + "puppet://$server/apache/conf.d/${name}" + ], + default => "puppet://$server/$source", + } + File["apache_${name}"]{ + source => $real_source, + } + } + default: { + File["apache_${name}"]{ + content => $content, + } + } + } case $operatingsystem { openbsd: { info("no package dependency on ${operatingsystem} for ${name}") } default: { |