From 82ac86e1996e156eb98bb0b06a8926ec61c8fdcc Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Mon, 29 Aug 2005 22:31:04 +0000
Subject: changing default manifest location to /etc/puppet/manifests/site.pp

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@604 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet.rb b/lib/puppet.rb
index d204ed36f..0c5adfdcd 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -73,7 +73,8 @@ module Puppet
         :statedir       => [:puppetvar,      "state"],
 
         # then the files},
-        :manifest       => [:puppetconf,     "manifest.pp"],
+        :manifestdir    => [:puppetconf,     "manifests"],
+        :manifest       => [:manifestdir,    "site.pp"],
         :localconfig    => [:puppetconf,     "localconfig.ma"],
         :logfile        => [:logdir,         "puppet.log"],
         :httplogfile    => [:logdir,         "http.log"],
-- 
cgit