diff options
Diffstat (limited to 'manifests/vhost')
-rw-r--r-- | manifests/vhost/file.pp | 8 | ||||
-rw-r--r-- | manifests/vhost/file/documentrootfile.pp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index bacdca5..cdc0599 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -51,10 +51,10 @@ define apache::vhost::file( "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/apache/vhosts.d/$name.conf", - "puppet://$server/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf", - "puppet://$server/apache/vhosts.d/$operatingsystem/$name.conf", - "puppet://$server/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", + "puppet://$server/modules/apache/vhosts.d/$name.conf" ], default => "puppet://$server/$vhost_source", } diff --git a/manifests/vhost/file/documentrootfile.pp b/manifests/vhost/file/documentrootfile.pp index c9daf9c..89ca4ac 100644 --- a/manifests/vhost/file/documentrootfile.pp +++ b/manifests/vhost/file/documentrootfile.pp @@ -12,10 +12,10 @@ define apache::vhost::file::documentrootfile( "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" + "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename", + "puppet://$server/modules/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename", + "puppet://$server/modules/apache/vhost_varieties/$operatingsystem/$thedomain/$filename", + "puppet://$server/modules/apache/vhost_varieties/$thedomain/$filename" ], ensure => file, require => Apache::Vhost::Webdir["$thedomain"], |