diff options
| author | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
| commit | 1b2310bab053cd40616e9740f9d38ef8826b3764 (patch) | |
| tree | c3567eb47a1704cf709aa4341c8c5debb966a53b /manifests/vhost/file.pp | |
| parent | 57da0ebe11e5b6f99dc96c13845e4b3205442df1 (diff) | |
update apache module to 0.25.x style
Diffstat (limited to 'manifests/vhost/file.pp')
| -rw-r--r-- | manifests/vhost/file.pp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index cdc0599..caa649d 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -18,12 +18,12 @@ define apache::vhost::file( $use_mod_macro = false ){ $vhosts_dir = $operatingsystem ? { - centos => "$apache::centos::config_dir/vhosts.d/", - gentoo => "$apache::gentoo::config_dir/vhosts.d/", - debian => "$apache::debian::config_dir/vhosts.d/", - ubuntu => "$apache::ubuntu::config_dir/vhosts.d/", - openbsd => "$apache::openbsd::config_dir/vhosts.d/", - default => '/etc/apache2/vhosts.d/', + centos => "$apache::centos::config_dir/vhosts.d", + gentoo => "$apache::gentoo::config_dir/vhosts.d", + debian => "$apache::debian::config_dir/vhosts.d", + ubuntu => "$apache::ubuntu::config_dir/vhosts.d", + openbsd => "$apache::openbsd::config_dir/vhosts.d", + default => '/etc/apache2/vhosts.d', } $real_vhost_destination = $vhost_destination ? { 'absent' => "$vhosts_dir/$name.conf", @@ -46,11 +46,11 @@ define apache::vhost::file( 'absent': { $real_vhost_source = $vhost_source ? { 'absent' => [ - "puppet://$server/files/apache/vhosts.d/$fqdn/$name.conf", - "puppet://$server/files/apache/vhosts.d/$apache_cluster_node/$name.conf", - "puppet://$server/files/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/files/apache/vhosts.d/$operatingsystem/$name.conf", - "puppet://$server/files/apache/vhosts.d/$name.conf", + "puppet://$server/modules/site-apache/vhosts.d/$fqdn/$name.conf", + "puppet://$server/modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf", + "puppet://$server/modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet://$server/modules/site-apache/vhosts.d/$operatingsystem/$name.conf", + "puppet://$server/modules/site-apache/vhosts.d/$name.conf", "puppet://$server/modules/apache/vhosts.d/$name.conf", "puppet://$server/modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", "puppet://$server/modules/apache/vhosts.d/$operatingsystem/$name.conf", @@ -78,9 +78,9 @@ define apache::vhost::file( } file{$real_htpasswd_path: ensure => $ensure, - source => [ "puppet://$server/files/apache/htpasswds/$fqdn/$name", - "puppet://$server/files/apache/htpasswds/$apache_cluster_node/$name", - "puppet://$server/files/apache/htpasswds/$name" ], + source => [ "puppet://$server/modules/site-apache/htpasswds/$fqdn/$name", + "puppet://$server/modules/site-apache/htpasswds/$apache_cluster_node/$name", + "puppet://$server/modules/site-apache/htpasswds/$name" ], owner => root, group => 0, mode => 0644; } } |