diff options
author | andreas <andreas@immerda.ch> | 2009-02-17 16:29:34 +0000 |
---|---|---|
committer | andreas <andreas@immerda.ch> | 2009-02-17 16:29:34 +0000 |
commit | 8a91b34032b5d908bf372cc08df48c9934ec6548 (patch) | |
tree | 58045ad7fd98393609b99e8a6439b07468d303d6 | |
parent | 8c71f05376a400d27797237fa87e866b2e59133a (diff) |
documentrootfile define, at least working...
-rw-r--r-- | manifests/defines/vhost_files.pp | 58 | ||||
-rw-r--r-- | manifests/defines/vhost_varieties.pp | 5 |
2 files changed, 17 insertions, 46 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index fc12721..26e137e 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -252,55 +252,23 @@ define apache::vhost::template( } } -define apache::vhost::file::documentroot( - $domain = 'absent', - $path = 'absent', - $relative_path = 'absent', - $source = 'absent', - $require = 'absent' -){ - case $domain { - 'absent': { - fail("no domain specified: $domain defined for $name.") - } - } - $real_relative_path = $relative_path ? { - 'absent' => '', - './' => '', - default => "/$relative_path", - } - - $real_path = $path ? { - 'absent' => $operatingsystem ? { - openbsd => "/var/www/htdocs/$domain/www$real_relative_path", - default => "/var/www/vhosts/$domain/www$real_relative_path", - }, - default => "$path$real_relative_path", - } - $real_source = $source ? { - 'absent' => - [ "puppet://$server/files/apache/vhost_varieties/$fqdn/$domain/$name", - "puppet://$server/files/apache/vhost_varieties/$apache_cluster_node/$domain/$name", - "puppet://$server/files/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$domain/$name", - "puppet://$server/files/apache/vhost_varieties/$operatingsystem/$domain/$name", - "puppet://$server/files/apache/vhost_varieties/$domain/$name", - "puppet://$server/apache/vhost_varieties/$domain/$name", - "puppet://$server/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$domain/$name", - "puppet://$server/apache/vhost_varieties/$operatingsystem/$domain/$name", - "puppet://$server/apache/vhost_varieties/$domain/$name" +define apache::vhost::file::documentrootfile($filename,$thedomain){ + file{"$documentroot/$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", + "puppet://$server/files/apache/vhost_varieties/$thedomain/$filename", + "puppet://$server/apache/vhost_varieties/$thedomain/$filename", + "puppet://$server/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", + "puppet://$server/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", + "puppet://$server/apache/vhost_varieties/$thedomain/$filename" ], - default => $source - } - - file{"${name}": - path => $real_path, - source => $real_source, ensure => file, - require => File[real_path], - mode => 440; + mode => 440, + require => Apache::Vhost::Webdir["$thedomain"], } - } diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 2f74c90..87d22e7 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -293,7 +293,10 @@ define apache::vhost::php::joomla( mod_security => $mod_security, } - apache::vhost::file::documentroot{"configuration.php": domain => $name } + apache::vhost::file::documentrootfile{"joomlaconfigurationfile": + filename => 'configuration.php', + thedomain => $name + } } # run_mode: |