summaryrefslogtreecommitdiff
path: root/manifests/config
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2010-05-12 18:31:46 -0400
committerGabriel Filion <lelutin@gmail.com>2011-12-09 09:53:22 -0500
commita51e1de81e1200751613216ab7a074e82a5dc1c8 (patch)
tree52068b9fec7a474d54cfab3c8e1e5fa95490ac67 /manifests/config
parentc6bc93cdbb6d6bf27931f61c88a50eb11d0ff9bb (diff)
allow custom config file source in the form of an array
The $source argument is not flexible enough as it is. It currently forces the source to be unique. Sometimes we'd like to be able to specify an array of possible sources. So we'll use the $source directly with the file resource without enforcing its format. WATCH OUT: this could break currently deployed apache::config::file resources, so one should change occurences of this resource's argument from: source => "modules/site-apache/blah" to a full source specification string: source => "puppet:///modules/site-apache/blah"
Diffstat (limited to 'manifests/config')
-rw-r--r--manifests/config/file.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index d72ba2e..697b69a 100644
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -42,7 +42,7 @@ define apache::config::file(
"puppet://${server}/modules/apache/${confdir}/${operatingsystem}/${name}",
"puppet://${server}/modules/apache/${confdir}/${name}"
],
- default => "puppet://${server}/${source}",
+ default => $source,
}
File["apache_${name}"]{
source => $real_source,