diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-11-03 20:00:46 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-11-03 20:04:31 -0700 |
| commit | 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (patch) | |
| tree | 2ca24f5af952c5ef5456ec85ad4fe9e5acf14ac3 /lib/puppet/defaults.rb | |
| parent | 9e2a0e41dfb253a19180aeea6b66f65ca8d63133 (diff) | |
| parent | 4d3c41ee5316285bb0df38aeeb76746016803c16 (diff) | |
| download | puppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.tar.gz puppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.tar.xz puppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.zip | |
Merge branch 'next'
This marks the end of our first agile iteration.
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index ab127602b..c7bebf8f5 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -116,6 +116,7 @@ module Puppet :catalog_terminus => ["compiler", "Where to get node catalogs. This is useful to change if, for instance, you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."], :facts_terminus => [Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', "The node facts terminus."], + :inventory_terminus => [ "$facts_terminus", "Should usually be the same as the facts terminus" ], :httplog => { :default => "$logdir/http.log", :owner => "root", :mode => 0640, |