puppet 0.18.4 → 0.22.4

data/bin/puppetmasterd

@@ -3,12 +3,12 @@
 #
 # = Synopsis
 #
-# The central puppet server.  Can also function as a certificate authority.
+# The central puppet server.  Functions as a certificate authority by default.
 #
 # = Usage
 #
 #   puppetmasterd [-D|--daemonize] [-d|--debug] [-h|--help]
-#       [-l|--logdest <file>|console|syslog] [--noca] [--nobucket] [--nonodes]
+#       [-l|--logdest <file>|console|syslog] [--nobucket] [--nonodes]
 #       [-v|--verbose] [-V|--version]
 #
 # = Description
@@ -22,8 +22,10 @@
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/documentation/puppet-executable-reference
-# for the full list of acceptable parameters.
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppetmasterdd with
+# '--genconfig'.
 #
 # daemonize::
 #   Send the process into the background.  This is the default unless
@@ -37,15 +39,12 @@
 #
 # logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
-#   Defaults to sending messages to /var/puppet/log/puppet.log, or the console
+#   Defaults to sending messages to syslog, or the console
 #   if debugging or verbosity is enabled.
 #
 # nobucket::
 #   Do not function as a file bucket.
 #
-# noca::
-#   Do not function as a certificate authority.
-#
 # nonodes::
 #   Do not use individual node designations; each node will receive the result
 #   of evaluating the entire configuration.
@@ -80,7 +79,7 @@ end
 
 require 'getoptlong'
 require 'puppet'
-require 'puppet/server'
+require 'puppet/sslcertificates'
 
 options = [
 	[ "--daemonize", "-D",			GetoptLong::NO_ARGUMENT ],
@@ -94,30 +93,19 @@ options = [
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
 ]
-#Puppet::Log.newdestination(:syslog)
 
 # Add all of the config parameters as valid options.
 Puppet.config.addargs(options)
 
 result = GetoptLong.new(*options)
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue LoadError
-    $haveusage = false
-end
-
 master = {}
 ca = {}
 report = {}
 fs = {}
 bucket = {}
-args = {}
 
 options = {
-    :haveca => true,
     :havereport => true,
     :havebucket => true,
     :havemaster => true,
@@ -134,7 +122,7 @@ begin
             when "--debug"
                 options[:debug] = true
             when "--help"
-                if $haveusage
+                if Puppet.features.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -142,8 +130,6 @@ begin
                 end
             when "--noreports"
                 options[:havereport] = false
-            when "--noca"
-                options[:haveca] = false
             when "--nomaster"
                 options[:havemaster] = false
             when "--nobucket"
@@ -152,7 +138,7 @@ begin
                 master[:UseNodes] = false
             when "--logdest"
                 begin
-                    Puppet::Log.newdestination(arg)
+                    Puppet::Util::Log.newdestination(arg)
                     options[:setdest] = true
                 rescue => detail
                     if Puppet[:debug]
@@ -172,29 +158,25 @@ begin
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
     #$stderr.puts detail
-    # FIXME RDoc::usage doesn't seem to work
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
     exit(1)
 end
 
 # Handle the logging settings.
 if options[:debug] or options[:verbose]
     if options[:debug]
-        Puppet::Log.level = :debug
+        Puppet::Util::Log.level = :debug
     else
-        Puppet::Log.level = :info
+        Puppet::Util::Log.level = :info
     end
 
     unless options[:daemonize]
-        Puppet::Log.newdestination(:console)
+        Puppet::Util::Log.newdestination(:console)
         options[:setdest] = true
     end
 end
 
 unless options[:setdest]
-    Puppet::Log.newdestination(:syslog)
+    Puppet::Util::Log.newdestination(:syslog)
 end
 
 # Now parse the config
@@ -210,7 +192,7 @@ require 'etc'
 # Default to daemonizing, but if verbose or debug is specified,
 # default to staying in the foreground.
 unless options.include?(:daemonize)
-    if Puppet::Log.level == :debug or Puppet::Log.level == :info
+    if Puppet::Util::Log.level == :debug or Puppet::Util::Log.level == :info
         options[:daemonize] = false
     else
         options[:daemonize] = true
@@ -229,7 +211,7 @@ if options[:havereport]
     handlers[:Report] = report
 end
 
-if options[:haveca]
+if Puppet[:ca]
     handlers[:CA] = ca
 end
 
@@ -237,6 +219,20 @@ if options[:havebucket]
     handlers[:FileBucket] = bucket
 end
 
+if Puppet[:parseonly]
+    begin
+        Puppet::Network::Handler.master.new(master)
+    rescue => detail
+        if Puppet[:trace]
+            puts detail.backtrace
+        end
+        $stderr.puts detail
+        exit(32)
+    end
+    # we would have already exited if the file weren't syntactically correct
+    exit(0)
+end
+
 if File.exists?(Puppet[:fileserverconfig])
     fs[:Config] = Puppet[:fileserverconfig]
 #else
@@ -248,14 +244,27 @@ if fs.include?(:Config)
     handlers[:FileServer] = fs
 end
 
-args[:Handlers] = handlers
-
 begin
-    # use the default, um, everything
-    #server = Puppet::Server.new(:CA => ca)
-    server = Puppet::Server.new(args)
+    case Puppet[:servertype]
+    when "webrick"
+        # use the default, um, everything
+        require 'puppet/network/server/webrick'
+        server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
+    when "mongrel":
+        require 'puppet/network/server/mongrel'
+        handler = Puppet::Network::Server::MongrelHandler.new(handlers)
+        addr = Puppet[:bindaddress]
+        if addr == ""
+            addr =  "127.0.0.1"
+        end
+        server = Mongrel::HttpServer.new(addr, Puppet[:masterport])
+        server.register("/", handler)
+    else
+        Puppet.err "Invalid server type %s" % Puppet[:servertype]
+        exit(45)
+    end
 rescue => detail
-    if Puppet[:debug]
+    if Puppet[:trace]
         puts detail.backtrace
     end
     $stderr.puts detail
@@ -274,12 +283,10 @@ if Process.uid == 0
     end
 end
 
-if Puppet[:parseonly]
-    # we would have already exited if the file weren't syntactically correct
-    exit(0)
+# Mongrel doesn't shut down like webrick; we really need to write plugins for it.
+if Puppet[:servertype] == "webrick"
+    Puppet.newservice(server)
 end
-
-Puppet.newservice(server)
 Puppet.settraps
 
 if options[:daemonize]
@@ -287,6 +294,11 @@ if options[:daemonize]
 end
 
 Puppet.notice "Starting Puppet server version %s" % [Puppet.version]
-Puppet.start
+case Puppet[:servertype]
+when "webrick"
+    Puppet.start
+when "mongrel":
+    server.run.join
+end
 
-# $Id: puppetmasterd 1351 2006-07-01 17:27:54Z luke $
+# $Id: puppetmasterd 2417 2007-04-26 18:58:07Z luke $

data/bin/puppetrun

@@ -62,7 +62,12 @@
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #
-# See the configuration file for the full list of acceptable parameters.
+# See the configuration file documentation at
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppetmasterdd with
+# '--genconfig'.
+#
 #
 # all::
 #   Connect to all available hosts.  Requires LDAP support at this point.
@@ -119,10 +124,20 @@
         exit(1)
     end
 end
-require 'ldap'
+
+begin
+    require 'rubygems'
+rescue LoadError
+    # Nothing; we were just doing this just in case
+end
+
+begin
+    require 'ldap'
+rescue LoadError
+    $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
+end
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/client'
 require 'getoptlong'
 
 
@@ -166,16 +181,9 @@ def setupldap
     end
 end
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue LoadError
-    $haveusage = false
-end
-
 flags = [
     [ "--all",      "-a",	        GetoptLong::NO_ARGUMENT ],
+    [ "--tag",      "-t",           GetoptLong::REQUIRED_ARGUMENT ],
     [ "--class",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
     [ "--foreground", "-f",	        GetoptLong::NO_ARGUMENT ],
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
@@ -207,7 +215,7 @@ hosts = []
 classes = []
 tags = []
 
-Puppet::Log.newdestination(:console)
+Puppet::Util::Log.newdestination(:console)
 
 begin
     result.each { |opt,arg|
@@ -230,7 +238,7 @@ begin
             when "--host"
                 hosts << arg
             when "--help"
-                if $haveusage
+                if Puppet.features.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -253,16 +261,13 @@ begin
     }
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
     exit(1)
 end
 
 if options[:debug]
-    Puppet::Log.level = :debug
+    Puppet::Util::Log.level = :debug
 else
-    Puppet::Log.level = :info
+    Puppet::Util::Log.level = :info
 end
 
 # Now parse the config
@@ -334,18 +339,28 @@ while go
                 $stderr.print "Could not contact %s\n" % host
                 next
             end
-            client = Puppet::Client::Runner.new(
+            client = Puppet::Network::Client.runner.new(
                 :Server => host,
                 :Port => Puppet[:puppetport]
             )
 
             print "Triggering %s\n" % host
             begin
-                client.run(tags, options[:ignoreschedules], options[:foreground])
+                result = client.run(tags, options[:ignoreschedules], options[:foreground])
             rescue => detail
-                $stderr.print "Host %s failed: %s\n" % [host, detail]
+                $stderr.puts "Host %s failed: %s\n" % [host, detail]
                 exit(2)
             end
+            
+            case result
+            when "success": exit(0)
+            when "running":
+                $stderr.puts "Host %s is already running" % host
+                exit(3)
+            else
+                $stderr.puts "Host %s returned unknown answer '%s'" % [host, result]
+                exit(12)
+            end
         end
         children[pid] = host
     else
@@ -382,4 +397,4 @@ while go
 end
 
 
-# $Id: puppetrun 1338 2006-06-29 19:29:05Z luke $
+# $Id: puppetrun 2352 2007-03-24 22:07:19Z luke $

data/conf/freebsd/puppetd

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+
+# PROVIDE: puppetd
+# REQUIRE: NETWORK
+# KEYWORD: FreeBSD shutdown
+
+. /etc/rc.subr
+
+name=puppetd
+rcvar=`set_rcvar`
+
+# set defaults
+command=/usr/local/bin/puppetd
+pidfile="/var/run/$name.pid"
+#required_files="/usr/local/etc/$name.conf"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${puppetd_enable="NO"}
+: ${puppetd_config="/usr/local/etc/puppetd.conf"}
+: ${puppetd_flags=""}
+
+command_args="--config $puppetd_config $puppetd_flags"
+
+run_rc_command "$1"

data/conf/freebsd/puppetmasterd

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+
+# PROVIDE: puppetmasterd
+# REQUIRE: NETWORK
+# KEYWORD: FreeBSD shutdown
+
+. /etc/rc.subr
+
+name=puppetmasterd
+rcvar=`set_rcvar`
+
+# set defaults
+command=/usr/local/bin/puppetmasterd
+pidfile="/var/run/$name.pid"
+#required_files="/usr/local/etc/$name.conf"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${puppetmasterd_enable="NO"}
+: ${puppetmasterd_config="/usr/local/etc/puppetmasterd.conf"}
+: ${puppetmasterd_flags=""}
+
+command_args="--config $puppetmasterd_config $puppetmasterd_flags"
+
+run_rc_command "$1"

data/conf/gentoo/conf.d/puppet

@@ -0,0 +1,5 @@
+# Location of PID files
+PUPPET_PID_DIR="/var/run/puppet"
+
+# You may specify other parameters to the puppet client here
+#PUPPET_EXTRA_OPTS=""

data/conf/gentoo/conf.d/puppetmaster

@@ -0,0 +1,12 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Location of the main manifest
+#PUPPETMASTER_MANIFEST="/etc/puppet/manifests/site.pp"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"

data/conf/gentoo/init.d/puppet

@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+depend() {
+        need net
+        use dns logger
+}
+
+checkconfig() {
+        if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
+               eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+               return 1
+        fi
+
+        return 0
+}
+
+start() {
+        checkconfig || return $?
+
+        local options=""
+        [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+        ebegin "Starting puppet"
+        start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
+        eend $? "Failed to start puppet"
+}
+
+stop() {
+        ebegin "Stopping puppet"
+        start-stop-daemon --stop --quiet --pidfile ${PUPPET_PID_DIR}/puppetd.pid
+        local ret=$?
+        eend ${ret} "Failed to stop puppet"
+        rm -f ${PUPPET_PID_DIR}/puppetd.pid
+        return ${ret}
+}