diff options
author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /manifests/gentoo | |
parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) |
fix various puppet language things
Diffstat (limited to 'manifests/gentoo')
-rw-r--r-- | manifests/gentoo/module.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/gentoo/module.pp b/manifests/gentoo/module.pp index 99de0ff..1e9d03a 100644 --- a/manifests/gentoo/module.pp +++ b/manifests/gentoo/module.pp @@ -3,17 +3,17 @@ 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:///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/${::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/${::operatingsystem}/${name}.conf", "puppet:///modules/apache/modules.d/${name}.conf" ], default => "puppet:///$source", |