puppet 0.16.0 → 0.18.4

data/bin/puppetdoc

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 #
 # = Synopsis
@@ -99,7 +99,12 @@ def scrub(text)
     # indent from every line.
     if text =~ /^(\s+)/
         indent = $1
-        return text.gsub(/^#{indent}/,'')
+        begin
+            return text.gsub(/^#{indent}/,'')
+        rescue => detail
+            puts detail.backtrace
+            puts detail
+        end
     else
         return text
     end
@@ -111,12 +116,24 @@ def indent(text, tab)
     return text.gsub(/(^|\A)/, tab).gsub(/^ +\.\./, "..")
 end
 
+def paramwrap(name, text, namevar = false)
+    if namevar
+        name = name.to_s + " (*namevar*)"
+    end
+
+    puts "#### %s" % name
+    puts text
+
+    puts ""
+end
+
 # Print the docs for arguments
 def self.arguments
-    puts %{
-===========================
-Puppet Executable Reference
-===========================
+    puts %{---
+inMenu: true
+title: Configuration Reference
+---
+# Puppet Configuration Reference
 
 Every Puppet executable (with the exception of ``puppetdoc``) accepts all of
 these arguments, but not all of the arguments make sense for every executable.
@@ -129,6 +146,8 @@ This will not always be the case.  I have tried to be as thorough as possible
 in the descriptions of the arguments, so it should be obvious whether an
 argument is approprite or not.
 
+Any default values are in ``block type`` at the end of the description.
+
 }
 
     docs = {}
@@ -139,9 +158,20 @@ argument is approprite or not.
     docs.sort { |a, b|
         a[0].to_s <=> b[0].to_s
     }.each do |name, object|
-        puts "* **#{name.to_s}** (*#{object.section.to_s}*)"
+        # Make each name an anchor
+        puts %{#### <a name="#{name.to_s}">#{name.to_s}</a> (<em>#{object.section.to_s}</em>)}
+
         puts ""
-        puts "  " + object.desc.gsub(/\n/, " ")
+        default = ""
+        if val = object.value and val != ""
+            default = "  ``%s``" % val
+        end
+        begin
+            puts object.desc.gsub(/\n/, " ") + default
+        rescue => detail
+            puts detail.backtrace
+            puts detail
+        end
         puts ""
     end
 
@@ -149,21 +179,31 @@ end
 
 # Print the docs for types
 def self.types
-    puts %{
-==============
-Type Reference
-==============
+    puts %{---
+inMenu: true
+title: Type Reference
+---
+# Type Reference
+
 
     }
 
     types = {}
     Puppet::Type.eachtype { |type|
+        next if type.name == :puppet
+        next if type.name == :component
         types[type.name] = type
     }
+
+    # Build a simple TOC
+    puts "## Table of Contents"
+    puts "1. <a href='#meta-parameters'>Meta-Parameters</a>"
+    types.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, type|
+        puts "1. <a href='#%s'>%s</a>" % [type.name, type.name.to_s.capitalize]
+    end
+
     puts %{
----------------
-Meta-Parameters
----------------
+<h2><a name="meta-parameters">Meta-Parameters</a></h2>
 
 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
@@ -180,32 +220,37 @@ in your manifest, including defined components.
         params.sort { |a,b|
             a.to_s <=> b.to_s
         }.each { |param|
-            puts "- **" + param.to_s + "**"
+            paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)))
+            #puts "<dt>" + param.to_s + "</dt>"
             #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ')
-            puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
+            #puts "<dd>"
+            #puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab)
+            #puts scrub(Puppet::Type.metaparamdoc(param))
+            #puts "</dd>"
+
+            #puts ""
         }
     rescue => detail
+        puts detail.backtrace
         puts "incorrect metaparams: %s" % detail
         exit(1)
     end
 
     puts %{
------
-Types
------
+## 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.  In general, only developers will need to
   worry about which parameter is the ``namevar``.
   
-  In the following code::
+  In the following code:
 
-    file { "/etc/passwd":
-        owner => root,
-        group => root,
-        mode => 644
-    }
+      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
@@ -221,8 +266,6 @@ Types
     types.sort { |a,b|
         a.to_s <=> b.to_s
     }.each { |name,type|
-        next if name == :puppet
-        next if name == :component
 
         puts "
 
@@ -231,15 +274,10 @@ Types
 "
 
         puts "
-%s
-%s" % [name, "=" * (name.to_s.length + 4)]
-        #String.new('n%s\n') % name.to_s
-        #puts "**" + type.doc.gsub(/\n\s*/, ' ') + "**\n\n"
+<h2><a name='%s'>%s</a></h2>" % [name, name]
         puts scrub(type.doc) + "\n\n"
 
-        #puts tab(1) + "* namevar: %s" % type.namevar
         docs = {}
-        #puts "%s States\n'''''''''''''''''''''''''''''''" % name.to_s.capitalize
         type.validstates.sort { |a,b|
             a.to_s <=> b.to_s
         }.reject { |sname|
@@ -260,46 +298,25 @@ Types
             end
             doc = doc.dup
             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 + "---"
+            #str = indent(str, $tab)
             docs[sname]  = str
-            #puts "- **%s**" % sname
-            #puts tab(1) + state.doc.gsub(/\n\s*/,' ')
         }
 
-        puts "\n%s Parameters\n''''''''''''''''''''''''''''''" % name.to_s.capitalize
+        puts "\n### %s Parameters\n" % name.to_s.capitalize
         type.parameters.sort { |a,b|
             a.to_s <=> b.to_s
         }.each { |name,param|
-            docs[name] = indent(scrub(type.paramdoc(name)), $tab)
+            #docs[name] = indent(scrub(type.paramdoc(name)), $tab)
+            docs[name] = scrub(type.paramdoc(name))
         }
 
         docs.sort { |a, b|
             a[0].to_s <=> b[0].to_s
         }.each { |name, doc|
-            print "- **%s**" % name
-            if type.namevar == name and name != :name
-                puts " (*namevar*)"
-            else
-                puts ""
-            end
-            puts doc
+            namevar = type.namevar == name and name != :name
+            paramwrap(name, doc, namevar)
         }
         puts "\n"
     }
@@ -314,4 +331,4 @@ puts "
 "
 puts "\n*This page autogenerated on %s*" % Time.now
 
-# $Id: puppetdoc 1110 2006-04-11 23:44:36Z luke $
+# $Id: puppetdoc 1410 2006-07-21 15:10:11Z luke $

data/bin/puppetmasterd

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 #
 # = Synopsis
@@ -7,8 +7,9 @@
 #
 # = Usage
 #
-#   puppetmasterd [-h|--help] [-d|--debug] [-v|--verbose] [-V|--version]
-#               [--noca] [--nobucket]
+#   puppetmasterd [-D|--daemonize] [-d|--debug] [-h|--help]
+#       [-l|--logdest <file>|console|syslog] [--noca] [--nobucket] [--nonodes]
+#       [-v|--verbose] [-V|--version]
 #
 # = Description
 #
@@ -20,7 +21,13 @@
 # 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/documentation/puppet-executable-reference
+# for the full list of acceptable parameters.
+#
+# daemonize::
+#   Send the process into the background.  This is the default unless
+#   +verbose+ or +debug+ is enabled.
 #
 # debug::
 #   Enable full debugging.  Causes the daemon not to go into the background.
@@ -42,6 +49,10 @@
 # nonodes::
 #   Do not use individual node designations; each node will receive the result
 #   of evaluating the entire configuration.
+#
+# noreports::
+#   Do not start the reports server.
+#
 # verbose::
 #   Enable verbosity.  Causes the daemon not to go into the background.
 #
@@ -61,16 +72,24 @@
 # Copyright (c) 2005 Reductive Labs, LLC
 # Licensed under the GNU Public License
 
+# Do an initial trap, so that cancels don't get a stack trace.
+trap(:INT) do
+    $stderr.puts "Cancelling startup"
+    exit(0)
+end
+
 require 'getoptlong'
 require 'puppet'
 require 'puppet/server'
 
 options = [
+	[ "--daemonize", "-D",			GetoptLong::NO_ARGUMENT ],
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--noca",         			GetoptLong::NO_ARGUMENT ],
 	[ "--nobucket",        			GetoptLong::NO_ARGUMENT ],
+	[ "--noreports",       			GetoptLong::NO_ARGUMENT ],
 	[ "--nonodes",         			GetoptLong::NO_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
@@ -90,29 +109,30 @@ rescue LoadError
     $haveusage = false
 end
 
-haveca = true
 master = {}
 ca = {}
+report = {}
 fs = {}
 bucket = {}
 args = {}
-#user = Puppet[:user]
-#group = Puppet[:group]
-user = nil
-group = nil
-
-havebucket = true
 
-parseonly = false
-
-setdest = false
+options = {
+    :haveca => true,
+    :havereport => true,
+    :havebucket => true,
+    :havemaster => true,
+    :setdest => false,
+    :verbose => false,
+    :debug => false
+}
 
 begin
     result.each { |opt,arg|
         case opt
+            when "--daemonize"
+                options[:daemonize] = true
             when "--debug"
-                Puppet::Log.level = :debug
-                Puppet::Log.newdestination(:console)
+                options[:debug] = true
             when "--help"
                 if $haveusage
                     RDoc::usage && exit
@@ -120,25 +140,31 @@ begin
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
+            when "--noreports"
+                options[:havereport] = false
             when "--noca"
-                haveca = false
+                options[:haveca] = false
+            when "--nomaster"
+                options[:havemaster] = false
             when "--nobucket"
-                havebucket = false
+                options[:havebucket] = false
             when "--nonodes"
                 master[:UseNodes] = false
             when "--logdest"
                 begin
                     Puppet::Log.newdestination(arg)
-                    setdest = true
+                    options[:setdest] = true
                 rescue => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
                     $stderr.puts detail.to_s
                 end
             when "--version"
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
-                Puppet::Log.level = :info
-                Puppet::Log.newdestination :console
+                options[:verbose] = true
             else
                 Puppet.config.handlearg(opt, arg)
         end
@@ -152,7 +178,24 @@ rescue GetoptLong::InvalidOption => detail
     #end
     exit(1)
 end
-ca[:autosign] = Puppet[:autosign]
+
+# Handle the logging settings.
+if options[:debug] or options[:verbose]
+    if options[:debug]
+        Puppet::Log.level = :debug
+    else
+        Puppet::Log.level = :info
+    end
+
+    unless options[:daemonize]
+        Puppet::Log.newdestination(:console)
+        options[:setdest] = true
+    end
+end
+
+unless options[:setdest]
+    Puppet::Log.newdestination(:syslog)
+end
 
 # Now parse the config
 if Puppet[:config] and File.exists? Puppet[:config]
@@ -164,27 +207,33 @@ Puppet.genmanifest
 
 require 'etc'
 
-if Puppet::Log.level == :debug or Puppet::Log.level == :info or parseonly
-    args[:Daemonize] = false
-else
-    args[:Daemonize] = true
+# 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
+        options[:daemonize] = false
+    else
+        options[:daemonize] = true
+    end
 end
 
 handlers = {
-    :Master => master,
     :Status => {},
-    :Logger => {}
 }
 
-unless setdest
-    Puppet::Log.newdestination(:syslog)
+if options[:havemaster]
+    handlers[:Master] = master
+end
+
+if options[:havereport]
+    handlers[:Report] = report
 end
 
-if haveca
+if options[:haveca]
     handlers[:CA] = ca
 end
 
-if havebucket
+if options[:havebucket]
     handlers[:FileBucket] = bucket
 end
 
@@ -206,6 +255,9 @@ begin
     #server = Puppet::Server.new(:CA => ca)
     server = Puppet::Server.new(args)
 rescue => detail
+    if Puppet[:debug]
+        puts detail.backtrace
+    end
     $stderr.puts detail
     exit(1)
 end
@@ -214,6 +266,9 @@ if Process.uid == 0
     begin
         Puppet::Util.chuser
     rescue => detail
+        if Puppet[:debug]
+            puts detail.backtrace
+        end
         $stderr.puts "Could not change user to %s: %s" % [Puppet[:user], detail]
         exit(39)
     end
@@ -224,25 +279,14 @@ if Puppet[:parseonly]
     exit(0)
 end
 
-if args[:Daemonize]
-    server.daemonize
-end
-
+Puppet.newservice(server)
+Puppet.settraps
 
-[:INT, :TERM].each do |signal|
-    trap(signal) do
-        Puppet.notice "Caught #{signal}; shutting down"
-        server.shutdown
-    end
+if options[:daemonize]
+    server.daemonize
 end
 
 Puppet.notice "Starting Puppet server version %s" % [Puppet.version]
+Puppet.start
 
-begin
-    server.start
-rescue => detail
-    Puppet.err "Could not start puppetmaster: %s" % detail
-    exit(1)
-end
-
-# $Id: puppetmasterd 1012 2006-03-12 02:56:23Z luke $
+# $Id: puppetmasterd 1351 2006-07-01 17:27:54Z luke $