summaryrefslogtreecommitdiffstats
path: root/lib/puppet/daemon.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-28 04:08:38 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-28 04:08:38 +0000
commitbcfc469e4aa36ab8b98af57b1314e26d5d7a0a18 (patch)
tree0671fccd17cfa5764a5b7e7707d5424cf09420e4 /lib/puppet/daemon.rb
parent9539dbb5c8b54805a6c26f84f15abd6fdb5532b2 (diff)
downloadpuppet-bcfc469e4aa36ab8b98af57b1314e26d5d7a0a18.tar.gz
puppet-bcfc469e4aa36ab8b98af57b1314e26d5d7a0a18.tar.xz
puppet-bcfc469e4aa36ab8b98af57b1314e26d5d7a0a18.zip
Adding in all of the patches necessary to make a prototype rails interface to puppet nodes work. The biggest change is that there is now a separate NetworkClient class for every Client subclass, because otherwise you get namespace collisions. Most everything other change is a relatively minor patch.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1145 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/daemon.rb')
-rwxr-xr-xlib/puppet/daemon.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index c4aeefadb..4b9e1f6f0 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -89,6 +89,10 @@ module Puppet
return true
end
+ unless defined? @fqdn
+ self.fqdn
+ end
+
# we are not going to encrypt our key, but we need at a minimum
# a keyfile and a certfile
@certfile = File.join(Puppet[:certdir], [@fqdn, "pem"].join("."))
@@ -120,6 +124,10 @@ module Puppet
# of creating the cert request, contacting the remote system, and
# storing the cert locally.
def requestcert
+ unless @secureinit
+ raise Puppet::DevError,
+ "Tried to request cert without initialized security"
+ end
retrieved = false
Puppet.config.use(:puppet, :certificates)
# create the directories involved