diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-29 22:31:04 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-29 22:31:04 +0000 |
| commit | 82ac86e1996e156eb98bb0b06a8926ec61c8fdcc (patch) | |
| tree | f463f339931ab1c02fba6c59f1709bbb34c40088 | |
| parent | 3087f850fe668492b243308f51fffad383c0e43b (diff) | |
| download | puppet-82ac86e1996e156eb98bb0b06a8926ec61c8fdcc.tar.gz puppet-82ac86e1996e156eb98bb0b06a8926ec61c8fdcc.tar.xz puppet-82ac86e1996e156eb98bb0b06a8926ec61c8fdcc.zip | |
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
| -rwxr-xr-x | bin/puppetmasterd | 2 | ||||
| -rw-r--r-- | lib/puppet.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 8e0d33684..1e9735ff5 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -42,7 +42,7 @@ # # manifest:: # The central site manifest to use for providing clients with their individual -# configurations. Defaults to /etc/puppet/manifest.pp. +# configurations. Defaults to /etc/puppet/manifests/site.pp. # # noca:: # Do not function as a certificate authority. 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"], |