From 5062728a628942ee194fec4389d755d94b15a1d4 Mon Sep 17 00:00:00 2001
From: andreas <andreas@immerda.ch>
Date: Sat, 8 Mar 2008 16:56:49 +0000
Subject: immer noch falscher pfad

---
 manifests/init.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 0941894..e1f15e5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,7 +128,7 @@ define apache::vhost::file(
         ''  => [ 
             "puppet://$server/dist/apache/vhosts.d/${fqdn}/${name}.conf",
             "puppet://$server/dist/apache/vhosts.d/${name}.conf", 
-            "puppet://$server/apache/vhosts.d/${fqdn}/${name}.conf" 
+            "puppet://$server/apache/vhosts.d/${name}.conf" 
         ],
         default => "puppet://$server/$source",
     }
@@ -152,11 +152,12 @@ define apache::config::file(
     $real_source = $source ? {
         # get a whole bunch of possible sources if there is no specific source for that config-file
         '' => [ 
-            "puppet://$server/apache/conf/${fqdn}/${name}", 
             "puppet://$server/dist/apache/conf/${fqdn}/${name}",
+            "puppet://$server/dist/apache/conf/${name}",
             "puppet://$server/apache/conf/${name}.${operatingsystem}.${lsbdistcodename}",
             "puppet://$server/apache/conf/${name}.${operatingsystem}",
-            "puppet://$server/apache/conf/${name}.Default"
+            "puppet://$server/apache/conf/${name}.Default",
+            "puppet://$server/apache/conf/${name}"
         ],
         default => "puppet://$server/$source",
     }
-- 
cgit v1.2.3