puppet 0.9.2 → 0.13.0

data/bin/puppetca

@@ -9,9 +9,7 @@
 # = Usage
 #
 #   puppetca [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [--cadir <ca directory>] [-g|--generate] [-l|--list]
-#               [-s|--sign] [--ssldir <cert directory>]
-#               [-c|--confdir <configuration directory>]
+#               [-g|--generate] [-l|--list] [-s|--sign]
 #
 # = Description
 #
@@ -22,15 +20,14 @@
 #
 # = Options
 #
-# all::
-#   Operate on all outstanding requests.  Only makes sense with '--sign'.
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'ssldir' is a valid configuration
+# parameter, so you can specify '--ssldir <directory>' as an argument.
 #
-# cadir::
-#   Where to look for the ca directory.  Defaults to /etc/puppet/ssl/ca.
+# See the configuration file for the full list of acceptable parameters.
 #
-# confdir::
-#   The configuration root directory, where +puppetmasterd+ defaults to looking
-#   for all of its configuration files.  Defaults to +/etc/puppet+.
+# all::
+#   Operate on all outstanding requests.  Only makes sense with '--sign'.
 #
 # debug::
 #   Enable full debugging.
@@ -49,9 +46,6 @@
 #   Sign an outstanding certificate request.  Unless '--all' is specified,
 #   hosts must be listed after all flags.
 #
-# ssldir::
-#   The directory in which to store certificates.  Defaults to /etc/puppet/ssl.
-#
 # verbose::
 #   Enable verbosity.
 #
@@ -82,18 +76,20 @@ rescue LoadError
     $haveusage = false
 end
 
-result = GetoptLong.new(
+options = [
 	[ "--all",	    "-a",			GetoptLong::NO_ARGUMENT ],
-	[ "--cadir",	    			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--confdir",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--debug",    "-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--generate", "-g",  			GetoptLong::NO_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--list",	    "-l",			GetoptLong::NO_ARGUMENT ],
 	[ "--sign",	    "-s",			GetoptLong::NO_ARGUMENT ],
-	[ "--ssldir",	    			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ]
-)
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
 
 mode = nil
 all = false
@@ -104,12 +100,8 @@ begin
         case opt
             when "--all"
                 all = true
-            when "--cadir"
-                Puppet[:cadir] = arg
-            when "--confdir"
-                Puppet[:puppetconf] = arg
             when "--debug"
-                Puppet[:loglevel] = :debug
+                Puppet::Log.level = :debug
             when "--generate"
                 generate = arg
                 mode = :generate
@@ -124,10 +116,10 @@ begin
                 mode = :list
             when "--sign"
                 mode = :sign
-            when "--ssldir"
-                Puppet[:ssldir] = arg
             when "--verbose"
-                Puppet[:loglevel] = :info
+                Puppet::Log.level = :info
+            else
+                Puppet.config.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -138,7 +130,22 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
-ca = Puppet::SSLCertificates::CA.new()
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.config.parse(Puppet[:config])
+end
+
+Puppet.genconfig
+Puppet.genmanifest
+
+Puppet::Util.chuser
+
+begin
+    ca = Puppet::SSLCertificates::CA.new()
+rescue => detail
+    puts detail.to_s
+    exit(23)
+end
 
 unless mode
     $stderr.puts "You must specify --list or --sign"
@@ -163,6 +170,11 @@ when :sign
     end
 
     unless all
+        ARGV.each { |host|
+            unless hosts.include?(host)
+                $stderr.puts "No waiting request for %s" % host
+            end
+        }
         hosts = hosts.find_all { |host|
             ARGV.include?(host)
         }
@@ -177,6 +189,7 @@ when :sign
 
         begin
             ca.sign(csr)
+            $stderr.puts "Signed %s" % host
         rescue => detail
             $stderr.puts "Could not sign request for %s: %s" % [host, detail]
         end
@@ -210,4 +223,4 @@ else
     exit(42)
 end
 
-# $Id: puppetca 720 2005-10-21 06:16:43Z luke $
+# $Id: puppetca 873 2006-02-07 23:12:33Z luke $

data/bin/puppetd

@@ -9,10 +9,8 @@
 # = Usage
 #
 #   puppetd  [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [--ssldir <cert directory>] [-l|--logdest <syslog|<file>|console>]
-#               [--fqdn <host name>] [-p|--port <port>] [-s|--server <server>]
-#               [-w|--waitforcert <seconds>] [-c|--confdir <configuration directory>]
-#               [--vardir <var directory>] [--centrallogging]
+#               [-l|--logdest <syslog|<file>|console>] [--fqdn <host name>]
+#               [-o|--onetime] [-w|--waitforcert <seconds>] [--centrallogging]
 #
 # = Description
 #
@@ -29,14 +27,16 @@
 #
 # = Options
 #
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'server' is a valid configuration
+# parameter, so you can specify '--server <servername>' as an argument.
+#
+# See the configuration file for the full list of acceptable parameters.
+#
 # centrallogging::
 #   Send all produced logs to the central puppetmasterd system.  This currently
 #   results in a significant slowdown, so it is not recommended.
 #
-# confdir::
-#   The configuration root directory, where +puppetmasterd+ defaults to looking
-#   for all of its configuration files.  Defaults to +/etc/puppet+.
-#
 # debug::
 #   Enable full debugging.
 #
@@ -50,22 +50,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
-#   if debugging or verbosity is enabled.
-#
-# port::
-#   The port to which to connect on the remote server.  Currently defaults to 8139.
+#   Defaults to sending messages to syslog, or the console if debugging or
+#   verbosity is enabled.
 #
-# server::
-#   The remote server from whom to receive the local configuration.  Currently
-#   must also be the certificate authority.  Currently defaults to 'puppet'.
-#
-# ssldir::
-#   Where to store and find certificates.  Defaults to /etc/puppet/ssl.
-#
-# vardir::
-#   The variable-size directory, used for storing state.  Defaults to
-#   /var/puppet.
+# onetime::
+#   Run the configuration once, rather than as a long-running daemon.  This is
+#   useful for interactively running puppetd.
 #
 # verbose::
 #   Turn on verbose reporting.
@@ -79,7 +69,7 @@
 #
 # = Example
 #
-#   puppet -s puppet.domain.com
+#   puppetd --server puppet.domain.com
 #
 # = Author
 #
@@ -87,7 +77,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
 
@@ -103,22 +93,22 @@ rescue LoadError
     $haveusage = false
 end
 
-result = GetoptLong.new(
+options = [
 	[ "--centrallogging",			GetoptLong::NO_ARGUMENT ],
-	[ "--confdir",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--fqdn",     "-f",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--noop",	    "-n",			GetoptLong::NO_ARGUMENT ],
-	[ "--port",	    "-p",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--server",	"-s",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--ssldir",   				GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--onetime",  "-o",			GetoptLong::NO_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
 	[ "--version",	"-V",			GetoptLong::NO_ARGUMENT ],
-	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--waitforcert",	"-w",		GetoptLong::REQUIRED_ARGUMENT ]
-)
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
 
 server = "puppet"
 fqdn = nil
@@ -126,14 +116,19 @@ args = {}
 
 waitforcert = false
 
+onetime = false
+
 centrallogs = false
+
+setdest = false
+
 begin
     result.each { |opt,arg|
         case opt
+            # First check to see if the argument is a valid configuration parameter;
+            # if so, set it.
             when "--centrallogging"
                 centrallogs = true
-            when "--confdir"
-                Puppet[:puppetconf] = arg
             when "--help"
                 if $haveusage
                     RDoc::usage && exit
@@ -145,36 +140,34 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
-                Puppet[:loglevel] = :info
-                Puppet[:logdest] = :console
+                Puppet::Log.level = :info
+                Puppet::Log.newdestination(:console)
+                setdest = true
             when "--debug"
-                Puppet[:loglevel] = :debug
-                Puppet[:logdest] = :console
-            when "--noop"
-                Puppet[:noop] = true
-            when "--ssldir"
-                Puppet[:ssldir] = arg
+                Puppet::Log.level = :debug
+                Puppet::Log.newdestination(:console)
+                setdest = true
             when "--fqdn"
                 fqdn = arg
-            when "--server"
-                server = arg
+            when "--onetime"
+                onetime = true
             when "--port"
                 args[:Port] = arg
             when "--logdest"
                 begin
-                    Puppet[:logdest] = arg
+                    Puppet::Log.newdestination(arg)
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
-            when "--vardir"
-                Puppet[:puppetvar] = arg
             when "--waitforcert"
-                waitforcert = arg
+                waitforcert = arg.to_i
+            else
+                Puppet.config.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
+    $stderr.puts detail
     $stderr.puts "Try '#{$0} --help'"
-    #$stderr.puts detail
     # FIXME RDoc::usage doesn't seem to work
     #if $haveusage
     #    RDoc::usage(1,'usage')
@@ -182,15 +175,25 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
-bg = false
+Puppet.genconfig
+Puppet.genmanifest
+
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.config.parse(Puppet[:config])
+end
 
-if Puppet[:loglevel] == :debug or Puppet[:loglevel] == :info
+if Puppet::Log.level == :debug or Puppet::Log.level == :info
     args[:Daemonize] = false
 else
     args[:Daemonize] = true
 end
 
-args[:Server] = server
+unless setdest
+    Puppet::Log.newdestination(:syslog)
+end
+
+args[:Server] = Puppet[:server]
 if fqdn
     args[:FQDN] = fqdn
 end
@@ -201,13 +204,12 @@ if centrallogs
     if args.include?(:Port)
         logdest += ":" + args[:Port]
     end
-    Puppet[:logdest] = logdest
+    Puppet::Log.newdestination(logdest)
 end
 
-
+Puppet.notice "Starting Puppet client version %s" % [Puppet.version]
 client = Puppet::Client::MasterClient.new(args)
 
-
 unless client.readcert
     if waitforcert
         begin
@@ -225,22 +227,42 @@ unless client.readcert
             exit(1)
         end
     end
+
+    # Now, because the Net::HTTP object cannot be modified once we've connected,
+    # we need to recreate the client with the certs intact
+    client = Puppet::Client::MasterClient.new(args)
+    unless client.readcert
+        PUppet.err "Could not read certificates after retrieving them"
+        exit(34)
+    end
 end
 
-if bg
+if args[:Daemonize]
+    #exit(13)
     client.daemonize
 end
 
 # now set up the network client with the certs, now that we have them
 client.setcerts
 
-# and then retrieve and apply our configuration
-begin
-    client.getconfig
-    client.apply
-rescue => detail
-    Puppet.err detail.to_s
-    exit(13)
+trap(:INT) {
+    client.shutdown
+}
+
+if onetime
+    begin
+        client.run
+    rescue => detail
+        Puppet.err detail.to_s
+        if Puppet[:debug]
+            puts detail.backtrace
+        end
+    end
+else
+    client.start
+
+    # Mmm, hackish
+    Puppet.start
 end
 
-# $Id: puppetd 733 2005-10-28 21:28:59Z luke $
+# $Id: puppetd 873 2006-02-07 23:12:33Z luke $

data/bin/puppetdoc

@@ -45,17 +45,13 @@ rescue LoadError
     $haveusage = false
 end
 
-def tab(num)
-    return $tab * num
-end
-
 result = GetoptLong.new(
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ]
 )
 
 debug = false
 
-$tab = "   "
+$tab = "    "
 
 begin
     result.each { |opt,arg|
@@ -77,6 +73,33 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
+def scrub(text)
+    # For text with no carriage returns, there's nothing to do.
+    if text !~ /\n/
+        return text
+    end
+    indent = nil
+
+    # If we can match an indentation, then just remove that same level of
+    # indent from every line.
+    if text =~ /^(\s+)/
+        indent = $1
+        return text.gsub(/^#{indent}/,'')
+    else
+        return text
+    end
+
+end
+
+# Indent every line in the chunk except those which begin with '..'.
+def indent(text, tab)
+    return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
+end
+
+#def tab(num)
+#    return $tab * num
+#end
+
 puts %{
 ==============
 Type Reference
@@ -93,18 +116,29 @@ puts %{
 Meta-Parameters
 ---------------
 
-}
-params = []
-Puppet::Type.eachmetaparam { |param|
-    params << param
-}
+Metaparameters are parameters that work with any element; they are part of the
+Puppet framework itself rather than being part of the implementation of any
+given instance.  Thus, any defined metaparameter can be used with any instance
+in your manifest, including defined components.
 
-params.sort { |a,b|
-    a.to_s <=> b.to_s
-}.each { |param|
-    puts "- **" + param.to_s + "**"
-    puts tab(1) + Puppet::Type.metaparamdoc(param).gsub(/\n\s*/,' ')
 }
+begin
+    params = []
+    Puppet::Type.eachmetaparam { |param|
+        params << param
+    }
+
+    params.sort { |a,b|
+        a.to_s <=> b.to_s
+    }.each { |param|
+        puts "- **" + param.to_s + "**"
+        #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ')
+        puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
+    }
+rescue => detail
+    puts "incorrect metaparams: %s" % detail
+    exit(1)
+end
 
 puts %{
 -----
@@ -113,9 +147,25 @@ Types
 
 - *namevar* is the parameter used to uniquely identify a type instance.
   This is the parameter that gets assigned when a string is provided before
-  the colon in a type declaration.
-- *parameters* determine the specific configuration of the instance.
+  the colon in a type declaration.  In general, only developers will need to
+  worry about which parameter is the ``namevar``.
+  
+  In the following code::
+
+    file { "/etc/passwd":
+        owner => root,
+        group => root,
+        mode => 644
+    }
 
+  "/etc/passwd" is considered the name of the file object (used for things like
+  dependency handling), and because ``path`` is the namevar for ``file``, that
+  string is assigned to the ``path`` parameter.
+
+- *parameters* determine the specific configuration of the instance.  They either
+  directly modify the system (internally, these are called states) or they affect
+  how the instance behaves (e.g., adding a search path for ``exec`` instances
+  or determining recursion on ``file`` instances).
 
 }
 
@@ -136,8 +186,8 @@ types.sort { |a,b|
 %s" % [name, "=" * (name.to_s.length + 4)]
     #String.new('n%s\n') % name.to_s
     #puts "**" + type.doc.gsub(/\n\s*/, ' ') + "**\n\n"
-    puts type.doc.gsub(/\n\s*/, ' ') + "\n\n"
-    type.buildstatehash
+    puts scrub(type.doc) + "\n\n"
+
     #puts tab(1) + "* namevar: %s" % type.namevar
     docs = {}
     #puts "%s States\n'''''''''''''''''''''''''''''''" % name.to_s.capitalize
@@ -148,7 +198,33 @@ types.sort { |a,b|
         state.nodoc
     }.each { |sname|
         state = type.statebyname(sname)
-        docs[sname] = state.doc.gsub(/\n\s*/,' ')
+
+        doc = nil
+        str = nil
+        unless doc = state.doc.dup
+            $stderr.puts "No docs for %s[%s]" % [type, sname]
+            next
+        end
+        str = doc
+        #puts "A---" + str + "---"
+        str = scrub(str)
+        #puts "B---" + str + "---"
+        #str = indent(str, $tab)
+        #puts "C---" + str + "---"
+        #str = indent($tab, scrub(doc))
+
+        # If the state has values, then add them: 
+
+        #if values = state.values
+        #    unless values.empty?
+        #        extra = "Acceptable values are %s." % values.join(", ")
+        #        str += "\n\n#{extra}"
+        #    end
+        #end
+
+        str = indent(str, $tab)
+        #puts "---" + str + "---"
+        docs[sname]  = str
         #puts "- **%s**" % sname
         #puts tab(1) + state.doc.gsub(/\n\s*/,' ')
     }
@@ -157,7 +233,7 @@ types.sort { |a,b|
     type.parameters.sort { |a,b|
         a.to_s <=> b.to_s
     }.each { |name,param|
-        docs[name] = type.paramdoc(name).gsub(/\n\s*/,' ')
+        docs[name] = indent(scrub(type.paramdoc(name)), $tab)
     }
 
     docs.sort { |a, b|
@@ -169,7 +245,7 @@ types.sort { |a,b|
         else
             puts ""
         end
-        puts tab(1) + doc
+        puts doc
     }
     puts "\n"
 }
@@ -181,4 +257,4 @@ puts "
 "
 
 puts "\n*This page autogenerated on %s*" % Time.now
-# $Id: puppetdoc 742 2005-11-16 17:12:11Z luke $
+# $Id: puppetdoc 832 2006-01-17 07:11:50Z luke $