puppet 0.18.4 → 0.22.4

data/examples/root/etc/puppet/namespaceauth.conf

@@ -0,0 +1,20 @@
+# This file is only necessary if your clients listen.
+# Note that it affects all puppet daemons, including puppetmasterd,
+# which is why puppetmaster is in there.
+[fileserver]
+    allow *.madstop.com
+
+[puppetmaster]
+    allow *.madstop.com
+
+[pelementserver]
+    allow puppet.madstop.com
+
+[puppetrunner]
+    allow culain.madstop.com
+
+[puppetbucket]
+    allow *.madstop.com
+
+[puppetreports]
+    allow *.madstop.com

data/examples/root/etc/puppet/puppetd.conf

@@ -0,0 +1,4 @@
+[puppet]
+report = true
+factsync = true
+pluginsync = true

data/examples/root/etc/puppet/puppetmasterd.conf

@@ -1,10 +1,7 @@
-[server]
-    port = 8139
-    handlers = master, ca
+[puppetmasterd]
+reports = store,rrdgraph,tagmail,log
 
-[global]
-    config = /etc/puppet
-    var = /var/puppet
-
-[master]
-    File = $config/manifest.pp
+[ldap]
+ldapnodes = true
+ldapserver = culain.madstop.com
+ldapbase = dc=madstop,dc=com

data/examples/root/etc/puppet/tagmail.conf

@@ -0,0 +1 @@
+all: user@domain.com

data/ext/emacs/puppet-mode.el

@@ -89,6 +89,48 @@
   (make-local-variable 'paragraph-ignore-fill-prefix)
   (setq paragraph-ignore-fill-prefix t))
 
+(defun puppet-indent-line ()
+  "Indent current line as puppet code."
+  (interactive)
+  (beginning-of-line)
+  (if (bobp)
+      (indent-line-to 0)                ; First line is always non-indented
+    (let ((not-indented t) cur-indent)
+      (if (looking-at "^.*}") ; If the line we are looking at is the end of
+			      ; a block, then decrease the indentation
+          (progn
+            (save-excursion
+              (forward-line -1)
+            
+              (if (looking-at "^.*}")
+		  (progn
+                    (setq cur-indent (- (current-indentation) 2))
+		    (setq not-indented nil))
+		(setq cur-indent (- (current-indentation) 2))))
+	    (if (< cur-indent 0)     ; We can't indent past the left margin
+		(setq cur-indent 0)))
+	(save-excursion
+	  (while not-indented ; Iterate backwards until we find an
+			      ; indentation hint
+	    (forward-line -1)
+	    (if (looking-at "^.*}") ; This hint indicates that we need to
+				    ; indent at the level of the END_ token
+		(progn
+		  (setq cur-indent (current-indentation))
+		  (setq not-indented nil))
+	      (if (looking-at "^.*{") ; This hint indicates that we need to
+				      ; indent an extra level
+		  (progn
+                                        ; Do the actual indenting
+		    (setq cur-indent (+ (current-indentation) 2)) 
+		    (setq not-indented nil))
+		(if (bobp)
+		    (setq not-indented nil)))))))
+      (if cur-indent
+	  (indent-line-to cur-indent)
+	(indent-line-to 0)))))
+
+
 ;;;###autoload
 (defun puppet-mode ()
   "Major mode for editing puppet manifests.
@@ -101,9 +143,12 @@ The variable puppet-indent-level controls the amount of indentation.
   (setq mode-name "Puppet")
   (setq major-mode 'puppet-mode)
   (puppet-mode-variables)
-
+ ;; Register our indentation function
+  (set (make-local-variable 'indent-line-function) 'puppet-indent-line)  
   (run-hooks 'puppet-mode-hook))
 
+
+
 (cond
  ((featurep 'font-lock)
   (or (boundp 'font-lock-variable-name-face)

data/ext/logcheck/puppet

@@ -0,0 +1,15 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Starting Puppet server version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled configuration for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Caught TERM; shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting Puppet client version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: getting config$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Caching configuration at [\/._[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Loaded state in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Calling puppetmaster.getconfig$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Retrieved configuration in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting configuration run$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Finished configuration run in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Caught (TERM|INT); shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Restarting with .*$

data/ext/module_puppet

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 #
 # = Synopsis
@@ -47,18 +47,10 @@
 # Licensed under the GNU Public License
 
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/handler'
+require 'puppet/network/client'
 require 'getoptlong'
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue LoadError
-    $haveusage = false
-end
-
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
@@ -92,7 +84,7 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--help"
-                if $haveusage
+                if Puppet.features.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -101,16 +93,16 @@ begin
             when "--use-nodes"
                 master[:UseNodes] = true
             when "--verbose"
-                Puppet::Log.level = :info
-                Puppet::Log.newdestination(:console)
+                Puppet::Util::Log.level = :info
+                Puppet::Util::Log.newdestination(:console)
                 verbose = true
             when "--debug"
-                Puppet::Log.level = :debug
-                Puppet::Log.newdestination(:console)
+                Puppet::Util::Log.level = :debug
+                Puppet::Util::Log.newdestination(:console)
                 debug = true
             when "--logdest"
                 begin
-                    Puppet::Log.newdestination arg
+                    Puppet::Util::Log.newdestination arg
                     setdest=true
                 rescue => detail
                     $stderr.puts detail.to_s
@@ -121,9 +113,9 @@ begin
     }
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
+    if Puppet.features.usage?
+        RDoc::usage(1,'usage')
+    end
     exit(1)
 end
 
@@ -155,7 +147,7 @@ unless ARGV.length > 0
 end
 
 unless setdest
-    Puppet::Log.newdestination(:syslog)
+    Puppet::Util::Log.newdestination(:syslog)
 end
 
 master[:Manifest] = ARGV.shift
@@ -177,14 +169,14 @@ end
 master[:Classes] = classes
 
 begin
-    server = Puppet::Server::Master.new(master)
+    server = Puppet::Network::Handler.master.new(master)
 rescue => detail
     $stderr.puts detail
     exit(1)
 end
 
 begin
-    client = Puppet::Client::MasterClient.new(
+    client = Puppet::Network::Client.master.new(
         :Master => server,
         :Cache => false
     )

data/ext/vim/puppet.vim

@@ -2,11 +2,10 @@
 " Filename:     puppet.vim
 " Language:     puppet configuration file 
 " Maintainer:   Luke Kanies <luke@madstop.com>
-" URL:          http://reductivelabs.com/svn/puppet/trunk/ext/vim/puppet.vim
+" URL:          
 " Last Change: 
 " Version:      
 "
-" $Id: puppet.vim 875 2006-02-07 23:56:16Z luke $
 
 " Copied from the cfengine, ruby, and perl syntax files
 " For version 5.x: Clear all syntax items
@@ -22,6 +21,9 @@ syn keyword puppetDefType       class define site node inherits contained
 syn keyword puppetInherits      inherits contained
 syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
 syn match   puppetArgument      "\w\+" contained
+syn match   puppetArgument      "\$\w\+" contained
+syn match   puppetArgument      "'[^']+'" contained
+syn match   puppetArgument      '"[^"]+"' contained
 syn match   puppetDefName     "\w\+" contained
 
 syn match   puppetInstance           "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault

data/install.rb

@@ -30,7 +30,7 @@
 # 5) Install all library files ending in .rb from lib/ into Ruby's
 #    site_lib/version directory.
 #
-# $Id: install.rb 1266 2006-06-13 23:07:18Z luke $
+# $Id: install.rb 1479 2006-08-21 23:04:32Z luke $
 #++
 
 require 'rbconfig'
@@ -91,6 +91,7 @@ def check_prereqs
             require pre
         rescue LoadError
             puts "Could not load %s; cannot install" % pre
+            exit -1
         end
     }
 end

data/lib/puppet.rb

@@ -1,10 +1,14 @@
+# see the bottom of the file for further inclusions
 require 'singleton'
-require 'puppet/event-loop'
+require 'facter'
+require 'puppet/error'
+require 'puppet/external/event-loop'
 require 'puppet/util'
-require 'puppet/log'
-require 'puppet/config'
-
-# see the bottom of the file for further inclusions
+require 'puppet/util/log'
+require 'puppet/util/autoload'
+require 'puppet/util/config'
+require 'puppet/util/feature'
+require 'puppet/util/suidmanager'
 
 #------------------------------------------------------------
 # the top-level module
@@ -13,8 +17,9 @@ require 'puppet/config'
 # preferences for things like debugging
 #
 # it's also a place to find top-level commands like 'debug'
+
 module Puppet
-    PUPPETVERSION = '0.18.4'
+    PUPPETVERSION = '0.22.4'
 
     def Puppet.version
         return PUPPETVERSION
@@ -29,63 +34,23 @@ module Puppet
         # To keep a copy of arguments.  Set within Config#addargs, because I'm
         # lazy.
         attr_accessor :args
-    end
-
-    class Error < RuntimeError
-        attr_accessor :stack, :line, :file
-        attr_writer :backtrace
-
-        def backtrace
-            if defined? @backtrace
-                return @backtrace
-            else
-                return super
-            end
-        end
-
-        def initialize(message)
-            @message = message
-        end
-
-        def to_s
-            str = nil
-            if defined? @file and defined? @line and @file and @line
-                str = "%s in file %s at line %s" %
-                    [@message.to_s, @file, @line]
-            elsif defined? @line and @line
-                str = "%s at line %s" %
-                    [@message.to_s, @line]
-            else
-                str = @message.to_s
-            end
-
-            return str
-        end
-    end
-
-    class DevError < Error; end
-
-    def self.name
-        unless defined? @name
-            @name = $0.gsub(/.+#{File::SEPARATOR}/,'').sub(/\.rb$/, '')
-        end
-
-        return @name
+        attr_reader :features
+        attr_writer :name
     end
 
     # the hash that determines how our system behaves
-    @@config = Puppet::Config.new
+    @@config = Puppet::Util::Config.new
 
     # The services running in this process.
     @services ||= []
 
     # define helper messages for each of the message levels
-    Puppet::Log.eachlevel { |level|
+    Puppet::Util::Log.eachlevel { |level|
         define_method(level,proc { |args|
             if args.is_a?(Array)
                 args = args.join(" ")
             end
-            Puppet::Log.create(
+            Puppet::Util::Log.create(
                 :level => level,
                 :message => args
             )
@@ -96,157 +61,23 @@ module Puppet
     # I keep wanting to use Puppet.error
     # XXX this isn't actually working right now
     alias :error :err
+    
+    # The feature collection
+    @features = Puppet::Util::Feature.new('puppet/feature')
+
+    # Load the base features.
+    require 'puppet/feature/base'
 
     # Store a new default value.
     def self.setdefaults(section, hash)
         @@config.setdefaults(section, hash)
     end
 
-    # If we're running the standalone puppet process as a non-root user,
-    # use basedirs that are in the user's home directory.
-    conf = nil
-    var = nil
-    if self.name == "puppet" and Process.uid != 0
-        conf = File.expand_path("~/.puppet")
-        var = File.expand_path("~/.puppet/var")
-    else
-        # Else, use system-wide directories.
-        conf = "/etc/puppet"
-        var = "/var/puppet"
-    end
-
-    self.setdefaults(:puppet,
-        :confdir => [conf, "The main Puppet configuration directory."],
-        :vardir => [var, "Where Puppet stores dynamic and growing data."]
-    )
-
-    if self.name == "puppetmasterd"
-        self.setdefaults(:puppetmasterd,
-            :logdir => {:default => "$vardir/log",
-                :mode => 0750,
-                :owner => "$user",
-                :group => "$group",
-                :desc => "The Puppet log directory."
-            }
-        )
-    else
-        self.setdefaults(:puppet,
-            :logdir => ["$vardir/log", "The Puppet log directory."]
-        )
-    end
-
-    self.setdefaults(:puppet,
-        :statedir => { :default => "$vardir/state",
-            :mode => 01777,
-            :desc => "The directory where Puppet state is stored.  Generally,
-                this directory can be removed without causing harm (although it
-                might result in spurious service restarts)."
-        },
-        :rundir => { :default => "$vardir/run",
-            :mode => 01777,
-            :desc => "Where Puppet PID files are kept."
-        },
-        :lockdir => { :default => "$vardir/locks",
-            :mode => 01777,
-            :desc => "Where lock files are kept."
-        },
-        :statefile => { :default => "$statedir/state.yaml",
-            :mode => 0660,
-            :desc => "Where puppetd and puppetmasterd store state associated
-                with the running configuration.  In the case of puppetmasterd,
-                this file reflects the state discovered through interacting
-                with clients."
-            },
-        :ssldir => {
-            :default => "$confdir/ssl",
-            :mode => 0771,
-            :owner => "root",
-            :desc => "Where SSL certificates are kept."
-        },
-        :genconfig => [false,
-            "Whether to just print a configuration to stdout and exit.  Only makes
-            sense when used interactively.  Takes into account arguments specified
-            on the CLI."],
-        :genmanifest => [false,
-            "Whether to just print a manifest to stdout and exit.  Only makes
-            sense when used interactively.  Takes into account arguments specified
-            on the CLI."],
-        :color => [true, "Whether to use ANSI colors when logging to the console."],
-        :mkusers => [false,
-            "Whether to create the necessary user and group that puppetd will
-            run as."]
-    )
-
-    # Define the config default.
-    self.setdefaults(self.name,
-        :config => ["$confdir/#{self.name}.conf",
-            "The configuration file for #{self.name}."]
-    )
-
-    self.setdefaults("puppetmasterd",
-        :user => ["puppet", "The user puppetmasterd should run as."],
-        :group => ["puppet", "The group puppetmasterd should run as."],
-        :manifestdir => ["$confdir/manifests",
-            "Where puppetmasterd looks for its manifests."],
-        :manifest => ["$manifestdir/site.pp",
-            "The entry-point manifest for puppetmasterd."],
-        :masterlog => { :default => "$logdir/puppetmaster.log",
-            :owner => "$user",
-            :group => "$group",
-            :mode => 0660,
-            :desc => "Where puppetmasterd logs.  This is generally not used,
-                since syslog is the default log destination."
-        },
-        :masterhttplog => { :default => "$logdir/masterhttp.log",
-            :owner => "$user",
-            :group => "$group",
-            :mode => 0660,
-            :create => true,
-            :desc => "Where the puppetmasterd web server logs."
-        },
-        :masterport => [8140, "Which port puppetmasterd listens on."],
-        :parseonly => [false, "Just check the syntax of the manifests."]
-    )
-
-    self.setdefaults("puppetd",
-        :localconfig => { :default => "$confdir/localconfig",
-            :owner => "root",
-            :mode => 0660,
-            :desc => "Where puppetd caches the local configuration.  An
-                extension indicating the cache format is added automatically."},
-        :classfile => { :default => "$confdir/classes.txt",
-            :owner => "root",
-            :mode => 0644,
-            :desc => "The file in which puppetd stores a list of the classes
-                associated with the retrieved configuratiion.  Can be loaded in
-                the separate ``puppet`` executable using the ``--loadclasses``
-                option."},
-        :puppetdlog => { :default => "$logdir/puppetd.log",
-            :owner => "root",
-            :mode => 0640,
-            :desc => "The log file for puppetd.  This is generally not used."
-        },
-        :httplog => { :default => "$logdir/http.log",
-            :owner => "root",
-            :mode => 0640,
-            :desc => "Where the puppetd web server logs."
-        },
-        :server => ["puppet",
-            "The server to which server puppetd should connect"],
-        :ignoreschedules => [false,
-            "Boolean; whether puppetd should ignore schedules.  This is useful
-            for initial puppetd runs."],
-        :puppetport => [8139, "Which port puppetd listens on."],
-        :noop => [false, "Whether puppetd should be run in noop mode."],
-        :runinterval => [1800, # 30 minutes
-            "How often puppetd applies the client configuration; in seconds"]
-    )
-
 	# configuration parameter access and stuff
 	def self.[](param)
         case param
         when :debug:
-            if Puppet::Log.level == :debug
+            if Puppet::Util::Log.level == :debug
                 return true
             else
                 return false
@@ -267,9 +98,9 @@ module Puppet
 
     def self.debug=(value)
         if value
-            Puppet::Log.level=(:debug)
+            Puppet::Util::Log.level=(:debug)
         else
-            Puppet::Log.level=(:notice)
+            Puppet::Util::Log.level=(:notice)
         end
     end
 
@@ -277,7 +108,33 @@ module Puppet
         @@config
     end
 
+    # Load all of the configuration parameters.
+    require 'puppet/configuration'
+
     def self.genconfig
+        if Puppet[:configprint] != ""
+            val = Puppet[:configprint]
+            if val == "all"
+                hash = {}
+                Puppet.config.each do |name, obj|
+                    val = obj.value
+                    case val
+                    when true, false, "": val = val.inspect
+                    end
+                    hash[name] = val
+                end
+                hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, val|
+                    puts "%s = %s" % [name, val]
+                end
+            elsif val =~ /,/
+                val.split(/\s*,\s*/).sort.each do |v|
+                    puts "%s = %s" % [v, Puppet[v]]
+                end
+            else
+                puts Puppet[val]
+            end
+            exit(0)
+        end
         if Puppet[:genconfig]
             puts Puppet.config.to_config
             exit(0)
@@ -332,6 +189,7 @@ module Puppet
         command = $0 + " " + self.args.join(" ")
         Puppet.notice "Restarting with '%s'" % command
         Puppet.shutdown(false)
+        Puppet::Util::Log.reopen
         exec(command)
     end
 
@@ -341,13 +199,15 @@ module Puppet
         [:INT, :TERM].each do |signal|
             trap(signal) do
                 Puppet.notice "Caught #{signal}; shutting down"
+                Puppet.debug "Signal caught here:"
+                caller.each { |l| Puppet.debug l }
                 Puppet.shutdown
             end
         end
 
         # Handle restarting.
         trap(:HUP) do
-            if client = @services.find { |s| s.is_a? Puppet::Client::MasterClient } and client.running?
+            if client = @services.find { |s| s.is_a? Puppet::Network::Client::Master } and client.running?
                 client.restart
             else
                 Puppet.restart
@@ -358,7 +218,7 @@ module Puppet
         trap(:USR1) do
             done = 0
             Puppet.notice "Caught USR1; triggering client run"
-            @services.find_all { |s| s.is_a? Puppet::Client }.each do |client|
+            @services.find_all { |s| s.is_a? Puppet::Network::Client }.each do |client|
                 if client.respond_to? :running?
                     if client.running?
                         Puppet.info "Ignoring running %s" % client.class
@@ -380,6 +240,10 @@ module Puppet
                 Puppet.notice "No clients were run"
             end
         end
+
+        trap(:USR2) do
+            Puppet::Util::Log.reopen
+        end
     end
 
     # Shutdown our server process, meaning stop all services and all threads.
@@ -399,6 +263,7 @@ module Puppet
 
         # Stop our services
         defined? @services and @services.each do |svc|
+            next unless svc.respond_to?(:shutdown)
             begin
                 timeout(20) do
                     svc.shutdown
@@ -428,12 +293,12 @@ module Puppet
     # waiting for someone, somewhere, to generate events of some kind.
     def self.start(block = true)
         # Starting everything in its own thread, fwiw
-        defined? @services and @services.each do |svc|
+        defined? @services and @services.dup.each do |svc|
             newthread do
                 begin
                     svc.start
                 rescue => detail
-                    if Puppet[:debug]
+                    if Puppet[:trace]
                         puts detail.backtrace
                     end
                     @services.delete svc
@@ -442,15 +307,15 @@ module Puppet
             end
         end
 
+        # We need to give the services a chance to register their timers before
+        # we try to start monitoring them.
+        sleep 0.5
+
         unless @services.length > 0
             Puppet.notice "No remaining services; exiting"
             exit(1)
         end
 
-        # We need to give the services a chance to register their timers before
-        # we try to start monitoring them.
-        sleep 0.5
-
         if defined? @timers and ! @timers.empty?
             @timers.each do |timer|
                 EventLoop.current.monitor_timer timer
@@ -510,8 +375,8 @@ module Puppet
     end
 
     # Create a new type.  Just proxy to the Type class.
-    def self.newtype(name, parent = nil, &block)
-        Puppet::Type.newtype(name, parent, &block)
+    def self.newtype(name, options = {}, &block)
+        Puppet::Type.newtype(name, options, &block)
     end
 
     # Retrieve a type by name.  Just proxy to the Type class.
@@ -520,8 +385,12 @@ module Puppet
     end
 end
 
-require 'puppet/server'
 require 'puppet/type'
-require 'puppet/storage'
+require 'puppet/modules'
+require 'puppet/util/storage'
+require 'puppet/parser/interpreter'
+if Puppet[:storeconfigs]
+    require 'puppet/rails'
+end
 
-# $Id: puppet.rb 1426 2006-07-22 21:10:47Z luke $
+# $Id: puppet.rb 2446 2007-05-01 03:52:33Z luke $