diff options
| author | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
| commit | 15757eb2334e614bc90c8d5235834352f72261e4 (patch) | |
| tree | f3a3783b50d782b0d8ca76a7884c64e3cbc08dd9 /manifests/gentoo/module.pp | |
| parent | 6158f2ad0cb07159b922b6036013a7be1e4dbab5 (diff) | |
| parent | 88dc913a5da951b1a261b6cc6d9767aaf641287d (diff) | |
Merge branch 'master' of labs.riseup.net:module_apache into riseup
Diffstat (limited to 'manifests/gentoo/module.pp')
| -rw-r--r-- | manifests/gentoo/module.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/gentoo/module.pp b/manifests/gentoo/module.pp index 7764c6f..1e9d03a 100644 --- a/manifests/gentoo/module.pp +++ b/manifests/gentoo/module.pp @@ -3,20 +3,20 @@ define apache::gentoo::module( $source = '', $destination = '' ){ - $modules_dir = "$apache::gentoo::config_dir/modules.d" + $modules_dir = "${apache::gentoo::config_dir}/modules.d" $real_destination = $destination ? { '' => "${modules_dir}/${name}.conf", default => $destination, } $real_source = $source ? { '' => [ - "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.conf", - "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.conf", - "puppet://$server/modules/site-apache/modules.d/${name}.conf", - "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.conf", - "puppet://$server/modules/apache/modules.d/${name}.conf" + "puppet:///modules/site_apache/modules.d/${::fqdn}/${name}.conf", + "puppet:///modules/site_apache/modules.d/${apache::cluster_node}/${name}.conf", + "puppet:///modules/site_apache/modules.d/${name}.conf", + "puppet:///modules/apache/modules.d/${::operatingsystem}/${name}.conf", + "puppet:///modules/apache/modules.d/${name}.conf" ], - default => "puppet://$server/$source", + default => "puppet:///$source", } file{"modules_${name}.conf": ensure => $ensure, |