summaryrefslogtreecommitdiffstats
path: root/lib/puppet/daemon.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-01-30 16:18:24 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-01-30 16:18:24 +0000
commit96b761b53e1284392975672a23dac0be504367c4 (patch)
treea5a9dc573f7031ff0a7169953438fae7b5cf01de /lib/puppet/daemon.rb
parentc7f9942a0305c8a583e222a004f18d4a8ed41837 (diff)
downloadpuppet-96b761b53e1284392975672a23dac0be504367c4.tar.gz
puppet-96b761b53e1284392975672a23dac0be504367c4.tar.xz
puppet-96b761b53e1284392975672a23dac0be504367c4.zip
Fixing waitforcert so that the client can actually add the certs once it receives them
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@856 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/daemon.rb')
-rwxr-xr-xlib/puppet/daemon.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index a8ef0a87a..fcedff3d7 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -3,7 +3,8 @@
require 'puppet'
module Puppet
- # A module that handles operations common to all daemons.
+ # A module that handles operations common to all daemons. This is included
+ # into the Server and Client base classes.
module Daemon
def daemonname
$0.sub(/.+#{File::SEPARATOR}/,'')
@@ -74,6 +75,7 @@ module Puppet
return log
end
+ # Read in an existing certificate.
def readcert
return unless @secureinit
# verify we've got all of the certs set up and such
@@ -109,6 +111,9 @@ module Puppet
return true
end
+ # Request a certificate from the remote system. This does all of the work
+ # of creating the cert request, contacting the remote system, and
+ # storing the cert locally.
def requestcert
retrieved = false
# create the directories involved