summaryrefslogtreecommitdiffstats
path: root/lib/puppet/daemon.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/daemon.rb')
-rwxr-xr-xlib/puppet/daemon.rb323
1 files changed, 61 insertions, 262 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index 13caf4541..52197f562 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -1,284 +1,83 @@
-# helper functions for daemons
-
require 'puppet'
require 'puppet/util/pidlock'
-module Puppet
- # A module that handles operations common to all daemons. This is included
- # into the Server and Client base classes.
- module Daemon
- include Puppet::Util
-
- Puppet.config.setdefaults(:puppet, :setpidfile => [true,
- "Whether to store a PID file for the daemon."])
- def daemonname
- #$0.sub(/.+#{File::SEPARATOR}/,'')
- Puppet.execname
- end
-
- # The path to the pid file for this server
- def pidfile
- File.join(Puppet[:rundir], daemonname() + ".pid")
- end
-
- # Put the daemon into the background.
- def daemonize
- if pid = fork()
- Process.detach(pid)
- exit(0)
- end
+# A module that handles operations common to all daemons. This is included
+# into the Server and Client base classes.
+module Puppet::Daemon
+ include Puppet::Util
- # Get rid of console logging
- Puppet::Util::Log.close(:console)
+ def daemonname
+ Puppet[:name]
+ end
- Process.setsid
- Dir.chdir("/")
- begin
- $stdin.reopen "/dev/null"
- $stdout.reopen "/dev/null", "a"
- $stderr.reopen $stdout
- Puppet::Util::Log.reopen
- rescue => detail
- File.open("/tmp/daemonout", "w") { |f|
- f.puts "Could not start %s: %s" % [Puppet.execname, detail]
- }
- Puppet.err "Could not start %s: %s" % [Puppet.execname, detail]
- exit(12)
- end
+ # Put the daemon into the background.
+ def daemonize
+ if pid = fork()
+ Process.detach(pid)
+ exit(0)
end
-
- def fqdn
- unless defined? @fqdn and @fqdn
- hostname = Facter.value("hostname")
- domain = Facter.value("domain")
- if !domain || domain.empty? then
- @fqdn = hostname
- else
- @fqdn = [hostname, domain].join(".")
- end
- end
- return @fqdn
+
+ setpidfile()
+
+ # Get rid of console logging
+ Puppet::Util::Log.close(:console)
+
+ Process.setsid
+ Dir.chdir("/")
+ begin
+ $stdin.reopen "/dev/null"
+ $stdout.reopen "/dev/null", "a"
+ $stderr.reopen $stdout
+ Puppet::Util::Log.reopen
+ rescue => detail
+ File.open("/tmp/daemonout", "w") { |f|
+ f.puts "Could not start %s: %s" % [Puppet[:name], detail]
+ }
+ Puppet.err "Could not start %s: %s" % [Puppet[:name], detail]
+ exit(12)
end
+ end
- def httplog
- args = []
-
- # yuck; separate http logs
- file = nil
- Puppet.config.use(:puppet, :certificates, Puppet.execname)
- if Puppet.execname == "puppetmasterd"
- file = Puppet[:masterhttplog]
- else
- file = Puppet[:httplog]
- end
-#
-# unless FileTest.exists?(File.dirname(file))
-# Puppet.recmkdir(File.dirname(file))
-# end
-
- args << file
- if Puppet[:debug]
- args << WEBrick::Log::DEBUG
- end
-
- log = WEBrick::Log.new(*args)
-
-
- return log
- end
-
- # Read in an existing certificate.
- def readcert
- return unless @secureinit
- Puppet.config.use(:puppet, :certificates)
- # verify we've got all of the certs set up and such
-
- if defined? @cert and defined? @key and @cert and @key
- 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("."))
- #@cacertfile = File.join(Puppet[:certdir], ["ca", "pem"].join("."))
- #@keyfile = File.join(Puppet[:privatekeydir], [@fqdn, "pem"].join("."))
- #@publickeyfile = File.join(Puppet[:publickeydir], [@fqdn, "pem"].join("."))
- @certfile = Puppet[:hostcert]
- @cacertfile = Puppet[:localcacert]
- @keyfile = Puppet[:hostprivkey]
- @publickeyfile = Puppet[:hostpubkey]
-
- if File.exists?(@keyfile)
- # load the key
- @key = OpenSSL::PKey::RSA.new(File.read(@keyfile))
- else
- return false
- end
-
- if File.exists?(@certfile)
- if File.exists?(@cacertfile)
- @cacert = OpenSSL::X509::Certificate.new(File.read(@cacertfile))
- else
- raise Puppet::Error, "Found cert file with no ca cert file"
- end
- @cert = OpenSSL::X509::Certificate.new(File.read(@certfile))
- else
- return false
- end
- 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
- unless @secureinit
- raise Puppet::DevError,
- "Tried to request cert without initialized security"
- end
- retrieved = false
- Puppet.config.use(:puppet, :certificates)
- # create the directories involved
- # FIXME it's a stupid hack that i have to do this
-# [Puppet[:certdir], Puppet[:privatekeydir], Puppet[:csrdir],
-# Puppet[:publickeydir]].each { |dir|
-# unless FileTest.exists?(dir)
-# Puppet.recmkdir(dir, 0770)
-# end
-# }
-
- if self.readcert
- Puppet.info "Certificate already exists; not requesting"
- return true
- end
-
- unless defined? @key and @key
- # create a new one and store it
- Puppet.info "Creating a new SSL key at %s" % @keyfile
- @key = OpenSSL::PKey::RSA.new(Puppet[:keylength])
- Puppet.config.write(:hostprivkey) do |f| f.print @key.to_pem end
- Puppet.config.write(:hostpubkey) do |f|
- f.print @key.public_key.to_pem
- end
- #File.open(@keyfile, "w", 0660) { |f| f.print @key.to_pem }
- #File.open(@publickeyfile, "w", 0660) { |f|
- # f.print @key.public_key.to_pem
- #}
- end
-
-
- unless defined? @driver
- Puppet.err "Cannot request a certificate without a defined target"
- return false
- end
-
- unless defined? @csr
- Puppet.info "Creating a new certificate request for %s" % @fqdn
- name = OpenSSL::X509::Name.new([["CN", @fqdn]])
-
- @csr = OpenSSL::X509::Request.new
- @csr.version = 0
- @csr.subject = name
- @csr.public_key = @key.public_key
- @csr.sign(@key, OpenSSL::Digest::MD5.new)
- end
-
- Puppet.info "Requesting certificate"
-
- # We can only request a client with a CA client, so we need
- # to create one if we don't already have one (or if we're not a CA
- # server).
- caclient = nil
- if @driver.is_a? Puppet::Network::Client::CA or @driver.is_a? Puppet::Network::Server::CA
- caclient = @driver
- else
- # Create a CA client with which to request the cert.
- if @driver.local?
- raise Puppet::DevError,
- "Incorrect setup for a local CA request"
- end
- caclient = Puppet::Network::Client::CA.new(
- :Port => @driver.puppet_port,
- :Server => @driver.puppet_server
- )
- end
-
- begin
- cert, cacert = caclient.getcert(@csr.to_pem)
- rescue => detail
- if Puppet[:trace]
- puts detail.backtrace
- end
- raise Puppet::Error.new("Certificate retrieval failed: %s" %
- detail)
- end
-
- if cert.nil? or cert == ""
- return nil
- end
- Puppet.config.write(:hostcert) do |f| f.print cert end
- Puppet.config.write(:localcacert) do |f| f.print cacert end
- #File.open(@certfile, "w", 0644) { |f| f.print cert }
- #File.open(@cacertfile, "w", 0644) { |f| f.print cacert }
- begin
- @cert = OpenSSL::X509::Certificate.new(cert)
- @cacert = OpenSSL::X509::Certificate.new(cacert)
- retrieved = true
- rescue => detail
- raise Puppet::Error.new(
- "Invalid certificate: %s" % detail
- )
- end
-
- unless @cert.check_private_key(@key)
- raise Puppet::DevError, "Received invalid certificate"
- end
- return retrieved
+ # The path to the pid file for this server
+ def pidfile
+ if Puppet[:pidfile] != ""
+ Puppet[:pidfile]
+ else
+ File.join(Puppet[:rundir], daemonname() + ".pid")
end
+ end
- # Remove the pid file
- def rmpidfile
- threadlock(:pidfile) do
- locker = Puppet::Util::Pidlock.new(pidfile)
- if locker.locked?
- locker.unlock or Puppet.err "Could not remove PID file %s" % [pidfile]
- end
+ # Remove the pid file
+ def rmpidfile
+ threadlock(:pidfile) do
+ locker = Puppet::Util::Pidlock.new(pidfile)
+ if locker.locked?
+ locker.unlock or Puppet.err "Could not remove PID file %s" % [pidfile]
end
end
+ end
- # Create the pid file.
- def setpidfile
- return unless Puppet[:setpidfile]
-
- threadlock(:pidfile) do
- unless Puppet::Util::Pidlock.new(pidfile).lock
- Puppet.err("Could not create PID file: %s" % [pidfile])
- exit(74)
- end
+ # Create the pid file.
+ def setpidfile
+ threadlock(:pidfile) do
+ unless Puppet::Util::Pidlock.new(pidfile).lock
+ Puppet.err("Could not create PID file: %s" % [pidfile])
+ exit(74)
end
end
+ end
- # Shut down our server
- def shutdown
- # Remove our pid file
- rmpidfile()
-
- # And close all logs except the console.
- Puppet::Util::Log.destinations.reject { |d| d == :console }.each do |dest|
- Puppet::Util::Log.close(dest)
- end
+ # Shut down our server
+ def shutdown
+ # Remove our pid file
+ rmpidfile()
- super
+ # And close all logs except the console.
+ Puppet::Util::Log.destinations.reject { |d| d == :console }.each do |dest|
+ Puppet::Util::Log.close(dest)
end
- def start
- setpidfile()
- super
- end
+ super
end
end
generated by cgit (git 2.34.1) at 2024-10-05 22:29:39 +0000