diff options
| author | mh <mh@immerda.ch> | 2010-08-07 02:12:12 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-07 02:12:12 +0200 |
| commit | d50296539fc641b6387fcea712d950785c83cea3 (patch) | |
| tree | a02cba7455e86e73d6e040f0b00e84767f87b29b /manifests/vhost/file.pp | |
| parent | f534d097fb2ac5c49ce71f8a47d4de97efd22e28 (diff) | |
remove unnecessary fileserver variable (#2460)
Diffstat (limited to 'manifests/vhost/file.pp')
| -rw-r--r-- | manifests/vhost/file.pp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index 6ce8b7f..fca0a1e 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -46,16 +46,16 @@ define apache::vhost::file( 'absent': { $real_vhost_source = $vhost_source ? { 'absent' => [ - "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/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/modules/apache/vhosts.d/$operatingsystem/$name.conf", - "puppet://$server/modules/apache/vhosts.d/$name.conf" + "puppet:///modules/site-apache/vhosts.d/$fqdn/$name.conf", + "puppet:///modules/site-apache/vhosts.d/$apache_cluster_node/$name.conf", + "puppet:///modules/site-apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/site-apache/vhosts.d/$operatingsystem/$name.conf", + "puppet:///modules/site-apache/vhosts.d/$name.conf", + "puppet:///modules/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", + "puppet:///modules/apache/vhosts.d/$operatingsystem/$name.conf", + "puppet:///modules/apache/vhosts.d/$name.conf" ], - default => "puppet://$server/$vhost_source", + default => "puppet:///$vhost_source", } File["${name}.conf"]{ source => $real_vhost_source, @@ -77,9 +77,9 @@ define apache::vhost::file( } file{$real_htpasswd_path: ensure => $ensure, - 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" ], + source => [ "puppet:///modules/site-apache/htpasswds/$fqdn/$name", + "puppet:///modules/site-apache/htpasswds/$apache_cluster_node/$name", + "puppet:///modules/site-apache/htpasswds/$name" ], owner => root, group => 0, mode => 0644; } } |