On Wed, 2009-12-16 at 14:33 -0800, Luke Kanies wrote:
> These replace the yaml and file dirs,
> since in #1943 we're merging the file and yaml
> Terminus classes.
>
> Signed-off-by: Luke Kanies <[email protected]>
> ---
> lib/puppet/defaults.rb | 4 ++++
> spec/integration/defaults.rb | 8 ++++++++
> 2 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
> index 590de83..3c9dbd1 100644
> --- a/lib/puppet/defaults.rb
> +++ b/lib/puppet/defaults.rb
> @@ -454,6 +454,8 @@ module Puppet
> # it to be in the server section (#1138).
> :yamldir => {:default => "$vardir/yaml", :owner => "service", :group
> => "service", :mode => "750",
> :desc => "The directory in which YAML data is stored, usually in
> a subdirectory."},
> + :server_datadir => {:default => "$vardir/server_data", :owner =>
> "$user", :group => "$user", :mode => "750",
Shouldn't it be :owner=>"service", :group=>"service"?
> + :desc => "The directory in which serialized data is stored,
> usually in a subdirectory."},
> :reports => ["store",
> "The list of reports to generate. All reports are looked for
> in puppet/reports/<name>.rb, and multiple report names should be
> @@ -497,6 +499,8 @@ module Puppet
> },
> :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
> :desc => "The directory in which client-side YAML data is
> stored."},
> + :client_datadir => {:default => "$vardir/client_data", :mode =>
> "750",
> + :desc => "The directory in which serialized data is stored on
> the client."},
> :classfile => { :default => "$statedir/classes.txt",
> :owner => "root",
> :mode => 0644,
> diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
> index 0e9a03f..4049a44 100755
> --- a/spec/integration/defaults.rb
> +++ b/spec/integration/defaults.rb
> @@ -37,6 +37,14 @@ describe "Puppet defaults" do
> Puppet.settings[:yamldir].should_not ==
> Puppet.settings[:clientyamldir]
> end
>
> + it "should have a client_datadir setting" do
> + Puppet.settings[:client_datadir].should_not be_nil
> + end
> +
> + it "should have different values for the server_datadir and
> client_datadir" do
> + Puppet.settings[:server_datadir].should_not ==
> Puppet.settings[:client_datadir]
> + end
> +
> # See #1232
> it "should not specify a user or group for the clientyamldir" do
> Puppet.settings.setting(:clientyamldir).owner.should be_nil
--
Brice Figureau
Follow the latest Puppet Community evolutions on www.planetpuppet.org!
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
