From: pietro <pietro@riseup.net>
Date: Sat, 28 Nov 2009 02:58:39 +0000 (-0800)
Subject: Revert "fix source path."
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=76b0a31a76b8ab7509da3389379daa24b0610f73;p=puppet-common.git

Revert "fix source path."

This reverts commit 1fa98d6183e77517e3ab851072e37e4235a3fe67.
---

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index d618f3e..def5c94 100644
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -9,7 +9,7 @@
 # of puppet, the full path is /var/lib/puppet/modules/${name}. Every module
 # should # prefix its module_dirs with its name.
 # 
-# By default, the module_dir is loaded from "puppet:///$server/${name}/module_dir". If
+# By default, the module_dir is loaded from "puppet:///${name}/module_dir". If
 # that doesn't exist an empty directory is taken as source. The directory is
 # purged so that modules do not have to worry about removing cruft.
 # 
@@ -27,7 +27,7 @@ define module_dir (
 	} else {
 		file {
 			$dir:
-				source => [ "puppet://$server/${name}/module_dir", "puppet://$server/common/empty"],
+				source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"],
 				checksum => mtime,
 				# ignore the placeholder
 				ignore => '\.ignore',