diff options
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 073cdb1dc..1b0b402ec 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -132,6 +132,8 @@ module Puppet :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. This feature currently requires the ``diff/lcs`` Ruby library."], + :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750", + :desc => "The directory in which YAML data is stored, usually in a subdirectory."}, :daemonize => { :default => true, :desc => "Send the process into the background. This is the default.", :short => "D" @@ -507,11 +509,6 @@ module Puppet "The backend store to use for storing files by checksum (i.e., filebuckets)."] ) - self.setdefaults(:yaml, - :yamldir => ["$vardir/yaml", - "The directory in which YAML data is stored, usually in a subdirectory."] - ) - self.setdefaults(:rails, :dblocation => { :default => "$statedir/clientconfigs.sqlite3", :mode => 0660, |