diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 11 | ||||
| -rw-r--r-- | lib/puppet/indirector/yaml.rb | 5 | ||||
| -rwxr-xr-x | spec/unit/indirector/yaml.rb | 1 |
4 files changed, 9 insertions, 12 deletions
@@ -1,3 +1,7 @@ + Fixing #1138 -- the yamldir is automatically created by the + server now that it's in the :puppetmasterd section rather than + a separate :yaml section. + Disabling http keep-alive as a means of preventing #1010. There is now a constant in Puppet::Network::HttpPool that will disable or enable this feature, but note that we determined diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 964c544ba..0f01c2ee2 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -350,7 +350,11 @@ module Puppet :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status message of the client verification. Only used with Mongrel. This header must be set by the proxy to 'SUCCESS' if the client successfully authenticated, and anything else otherwise. - See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."] + See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."], + # To make sure this directory is created before we try to use it on the server, we need + # it to be in the server section (#1138). + :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750", + :desc => "The directory in which YAML data is stored, usually in a subdirectory."} ) self.setdefaults(:puppetd, @@ -671,10 +675,5 @@ module Puppet :rrdinterval => ["$runinterval", "How often RRD should expect data. This should match how often the hosts report back to the server."] ) - - Puppet.setdefaults(:yaml, - :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750", - :desc => "The directory in which YAML data is stored, usually in a subdirectory."} - ) end diff --git a/lib/puppet/indirector/yaml.rb b/lib/puppet/indirector/yaml.rb index 4baeb38db..4dd29159e 100644 --- a/lib/puppet/indirector/yaml.rb +++ b/lib/puppet/indirector/yaml.rb @@ -2,11 +2,6 @@ require 'puppet/indirector/terminus' # The base class for YAML indirection termini. class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus - def initialize - # Make sure our base directory exists. - Puppet.settings.use(:yaml) - end - # Read a given name's file in and convert it from YAML. def find(name) raise ArgumentError.new("You must specify the name of the object to retrieve") unless name diff --git a/spec/unit/indirector/yaml.rb b/spec/unit/indirector/yaml.rb index b61332485..339529ab0 100755 --- a/spec/unit/indirector/yaml.rb +++ b/spec/unit/indirector/yaml.rb @@ -20,7 +20,6 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do @subject.name = :me @dir = "/what/ever" - Puppet.settings.stubs(:use) Puppet.settings.stubs(:value).with(:yamldir).returns(@dir) end |