diff options
| author | andreas <andreas@immerda.ch> | 2009-02-17 17:19:08 +0000 |
|---|---|---|
| committer | andreas <andreas@immerda.ch> | 2009-02-17 17:19:08 +0000 |
| commit | 00556ea1f7dc250da7f374b20038eb2c4b90d99a (patch) | |
| tree | 4268096055a4aabd7363ceabe265ba48f046b98f /manifests/defines | |
| parent | 8fe2a4701222f0b36f071bd1a1fa064e8a17ef32 (diff) | |
set the owner group too
Diffstat (limited to 'manifests/defines')
| -rw-r--r-- | manifests/defines/vhost_files.pp | 18 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index 790c9bb..12de2ef 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -253,9 +253,15 @@ define apache::vhost::template( } -define apache::vhost::file::documentrootfile($documentroot,$filename,$thedomain){ +define apache::vhost::file::documentrootfile( + $documentroot, + $filename, + $thedomain, + $owner='root', + $group='0' + ){ file{"$documentroot/$filename": - source => [ "puppet://$server/files/apache/vhost_varieties/$fqdn/$thedomain/$filename", + source => [ "puppet://$server/files/apache/vhost_varieties/$fqdn/$thedomain/$filename", "puppet://$server/files/apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename", "puppet://$server/files/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", "puppet://$server/files/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", @@ -264,9 +270,11 @@ define apache::vhost::file::documentrootfile($documentroot,$filename,$thedomain) "puppet://$server/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", "puppet://$server/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", "puppet://$server/apache/vhost_varieties/$thedomain/$filename" - ], - ensure => file, - mode => 440, + ], + ensure => file, + mode => 440, + owner => $owner, + group => $group, require => Apache::Vhost::Webdir["$thedomain"], } } diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 465c589..fe526fe 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -296,7 +296,9 @@ define apache::vhost::php::joomla( apache::vhost::file::documentrootfile{"joomlaconfigurationfile": documentroot => $documentroot, filename => 'configuration.php', - thedomain => $name + thedomain => $name, + owner => $documentroot_owner, + group => $documentroot_group, } } |