diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-05 17:09:04 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-01-05 17:09:04 +0000 |
| commit | 704bd761057f075a0754bf6880bbb5c3b6014695 (patch) | |
| tree | 91c6b69e88a3fd41b21c9b3ae554f9651c237b01 /lib/puppet/client | |
| parent | e75671111b56e14ef6459bb783a261752efa0089 (diff) | |
Fixing a few testing bugs that have crept in, and fixing a self-reference problem when configuring, graphing, and setting graphdir manually.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2052 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
| -rw-r--r-- | lib/puppet/client/master.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index 79eb746a5..e20203fd1 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -139,12 +139,8 @@ class Puppet::Client::MasterClient < Puppet::Client # Cache the config def cache(text) - Puppet.config.use(:puppet, :sslcertificates, :puppetd) Puppet.info "Caching configuration at %s" % self.cachefile confdir = File.dirname(Puppet[:localconfig]) - #unless FileTest.exists?(confdir) - # Puppet.recmkdir(confdir, 0770) - #end File.open(self.cachefile + ".tmp", "w", 0660) { |f| f.print text } @@ -167,7 +163,6 @@ class Puppet::Client::MasterClient < Puppet::Client # Initialize and load storage def dostorage begin - Puppet::Storage.init Puppet::Storage.load rescue => detail if Puppet[:trace] @@ -276,6 +271,7 @@ class Puppet::Client::MasterClient < Puppet::Client # Just so we can specify that we are "the" instance. def initialize(*args) + Puppet.config.use(:puppet, :sslcertificates, :puppetd) super @configtime = Time.now |