summaryrefslogtreecommitdiff
path: root/manifests/config
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-08-11 15:28:58 +0200
committermh <mh@immerda.ch>2010-08-11 15:28:58 +0200
commitf2fad4fa29ff23b2220ba777f54f6be737e051be (patch)
treed37dea2637d23bf134443bb43a52faba20ce7008 /manifests/config
parentd275f9db71ffd55aeef9e96b9f923d1169dcaba9 (diff)
remove unnecessary fileserver variable (#2460) round II
Diffstat (limited to 'manifests/config')
-rw-r--r--manifests/config/file.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index d72ba2e..05108ee 100644
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -33,16 +33,16 @@ define apache::config::file(
'absent': {
$real_source = $source ? {
'absent' => [
- "puppet://${server}/modules/site-apache/${confdir}/${fqdn}/${name}",
- "puppet://${server}/modules/site-apache/${confdir}/${apache_cluster_node}/${name}",
- "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
- "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}/${name}",
- "puppet://${server}/modules/site-apache/${confdir}/${name}",
- "puppet://${server}/modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}",
- "puppet://${server}/modules/apache/${confdir}/${operatingsystem}/${name}",
- "puppet://${server}/modules/apache/${confdir}/${name}"
+ "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 => "puppet://${server}/${source}",
+ default => "puppet:///${source}",
}
File["apache_${name}"]{
source => $real_source,