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/vhost/file | |
| parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) | |
fix various puppet language things
Diffstat (limited to 'manifests/vhost/file')
| -rw-r--r-- | manifests/vhost/file/documentrootfile.pp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp index 8645323..610d71c 100644 --- a/manifests/vhost/file/documentrootfile.pp +++ b/manifests/vhost/file/documentrootfile.pp @@ -6,19 +6,19 @@ define apache::vhost::file::documentrootfile( $group='0', $mode=440 ){ - file{"$documentroot/$filename": - source => [ "puppet:///modules/site_apache/vhost_varieties/$fqdn/$thedomain/$filename", - "puppet:///modules/site_apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename", - "puppet:///modules/site_apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", - "puppet:///modules/site_apache/vhost_varieties/$operatingsystem/$thedomain/$filename", - "puppet:///modules/site_apache/vhost_varieties/$thedomain/$filename", - "puppet:///modules/apache/vhost_varieties/$thedomain/$filename", - "puppet:///modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", - "puppet:///modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", - "puppet:///modules/apache/vhost_varieties/$thedomain/$filename" + file{"${documentroot}/${filename}": + source => [ "puppet:///modules/site_apache/vhost_varieties/${::fqdn}/${thedomain}/${filename}", + "puppet:///modules/site_apache/vhost_varieties/${apache::cluster_node}/${thedomain}/${filename}", + "puppet:///modules/site_apache/vhost_varieties/${::operatingsystem}.${::lsbdistcodename}/${thedomain}/${filename}", + "puppet:///modules/site_apache/vhost_varieties/${::operatingsystem}/${thedomain}/${filename}", + "puppet:///modules/site_apache/vhost_varieties/${thedomain}/${filename}", + "puppet:///modules/apache/vhost_varieties/${thedomain}/${filename}", + "puppet:///modules/apache/vhost_varieties/${::operatingsystem}.${::lsbdistcodename}/${thedomain}/${filename}", + "puppet:///modules/apache/vhost_varieties/${::operatingsystem}/${thedomain}/${filename}", + "puppet:///modules/apache/vhost_varieties/${thedomain}/${filename}" ], ensure => file, - require => Apache::Vhost::Webdir["$thedomain"], + require => Apache::Vhost::Webdir[$thedomain], owner => $owner, group => $group, mode => $mode; } } |