summaryrefslogtreecommitdiff
path: root/manifests/vhost
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-11-02 00:56:24 +0100
committermh <mh@immerda.ch>2009-11-02 00:56:24 +0100
commit8cda647dbde6430fd0e7b844179f3d2b31b3490a (patch)
treef3275b591386d22d5a723703d7a5c2a0fcaa7480 /manifests/vhost
parentbc242369d26e942bab2a22e7dca8fec080aa0784 (diff)
recursivly updating file path to new 0.25 style
Diffstat (limited to 'manifests/vhost')
-rw-r--r--manifests/vhost/file.pp8
-rw-r--r--manifests/vhost/file/documentrootfile.pp8
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"],