diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-03 19:34:45 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-03 19:34:45 -0500 |
| commit | 782bc4d3b037684f472e1db53c1878390b8c9a32 (patch) | |
| tree | 5534fde81335e80f87e264db4a2757a317872dd8 | |
| parent | b727a95aa4b72ce057653101cf1f50fa49c4b0a8 (diff) | |
| download | puppet-782bc4d3b037684f472e1db53c1878390b8c9a32.tar.gz puppet-782bc4d3b037684f472e1db53c1878390b8c9a32.tar.xz puppet-782bc4d3b037684f472e1db53c1878390b8c9a32.zip | |
Fixing the yaml path so that it is correctly
created for puppetmasterd.
| -rw-r--r-- | lib/puppet/defaults.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f76ae9b84..45fe0f5b0 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -131,7 +131,9 @@ module Puppet :diff => ["diff", "Which diff command to use when printing differences between files."], :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."] + 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."} ) hostname = Facter["hostname"].value @@ -503,11 +505,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, |