puppet 0.16.0 → 0.18.4

data/examples/code/failers/noobjectrvalue

@@ -0,0 +1 @@
+$variable = file { "/etc/passwd": owner => root }

data/examples/code/snippets/deepclassheirarchy.pp

@@ -0,0 +1,23 @@
+# $Id: deepclassheirarchy.pp 1185 2006-05-12 22:22:45Z luke $
+
+class base {
+    file { "/tmp/deepclassheir1": ensure => file, mode => 755 }
+}
+
+class sub1 inherits base {
+    file { "/tmp/deepclassheir2": ensure => file, mode => 755 }
+}
+
+class sub2 inherits sub1 {
+    file { "/tmp/deepclassheir3": ensure => file, mode => 755 }
+}
+
+class sub3 inherits sub2 {
+    file { "/tmp/deepclassheir4": ensure => file, mode => 755 }
+}
+
+class sub4 inherits sub3 {
+    file { "/tmp/deepclassheir5": ensure => file, mode => 755 }
+}
+
+include sub4

data/examples/code/snippets/defineoverrides.pp

@@ -0,0 +1,17 @@
+# $Id: defineoverrides.pp 1181 2006-05-09 06:01:04Z luke $
+
+$file = "/tmp/defineoverrides1"
+
+define myfile(mode) {
+    file { $name: ensure => file, mode => $mode }
+}
+
+class base {
+    myfile { $file: mode => 644 }
+}
+
+class sub inherits base {
+    myfile { $file: mode => 755 }
+}
+
+include sub

data/examples/code/snippets/emptyexec.pp

@@ -0,0 +1,3 @@
+exec { "touch /tmp/emptyexectest":
+    path => "/usr/bin:/bin"
+}

data/examples/code/snippets/selectorvalues.pp

@@ -30,8 +30,13 @@ $mode5 = yay ? {
     default => 644
 }
 
+$mode6 = $mode5 ? {
+    755 => 755
+}
+
 file { "/tmp/selectorvalues1": ensure => file, mode => $mode1 }
 file { "/tmp/selectorvalues2": ensure => file, mode => $mode2 }
 file { "/tmp/selectorvalues3": ensure => file, mode => $mode3 }
 file { "/tmp/selectorvalues4": ensure => file, mode => $mode4 }
-file { "/tmp/selectorvalues5": ensure => file, mode => $mode4 }
+file { "/tmp/selectorvalues5": ensure => file, mode => $mode5 }
+file { "/tmp/selectorvalues6": ensure => file, mode => $mode6 }

data/examples/code/snippets/tagged.pp

@@ -0,0 +1,35 @@
+# $Id: tagged.pp 1139 2006-04-26 17:01:46Z luke $
+
+tag testing
+tag(funtest)
+
+define tagdefine {
+    $path = tagged(tagdefine) ? {
+        true => "true", false => "false"
+    }
+
+    file { "/tmp/taggeddefine$path": ensure => file }
+}
+
+tagdefine {}
+
+$yayness = tagged(yayness) ? {
+    true => "true", false => "false"
+}
+
+$testing = tagged(testing) ? {
+    true => "true", false => "false"
+}
+
+$both = tagged(testing, yayness) ? {
+    true => "true", false => "false"
+}
+
+$bothtrue = tagged(testing, testing) ? {
+    true => "true", false => "false"
+}
+
+file { "/tmp/taggedyayness$yayness": ensure => file }
+file { "/tmp/taggedtesting$testing": ensure => file }
+file { "/tmp/taggedboth$both": ensure => file }
+file { "/tmp/taggedbothtrue$bothtrue": ensure => file }

data/ext/ldap/puppet.schema

@@ -1,6 +1,6 @@
 # These OIDs are all fake.  No guarantees there won't be conflicts.
 #
-# $Id: puppet.schema 931 2006-02-23 20:21:10Z luke $
+# $Id: puppet.schema 1260 2006-06-13 18:09:07Z luke $
 
 attributetype ( 1.1.3.10 NAME 'puppetclass'
 	DESC 'Puppet Node Class'
@@ -12,6 +12,6 @@ attributetype ( 1.1.3.9 NAME 'parentnode'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-objectclass ( 1.1.1.2 NAME 'puppetClient' SUP ipHost AUXILIARY
+objectclass ( 1.1.1.2 NAME 'puppetClient' SUP top AUXILIARY
 	DESC 'Puppet Client objectclass'
 	MAY ( puppetclass $ parentnode ))

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 1030 2006-03-14 04:29:26Z luke $
+# $Id: install.rb 1266 2006-06-13 23:07:18Z luke $
 #++
 
 require 'rbconfig'
@@ -167,6 +167,7 @@ def prepare_installation
     FileUtils.makedirs(bd)
     FileUtils.makedirs(sd)
   else
+    bd = Config::CONFIG['bindir']
     bds << Config::CONFIG['bindir']
   end
 
@@ -278,6 +279,7 @@ def install_binfile(from, op_file, target)
       installed_wrapper = true
     end
   end
+  p target
   FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
   File.unlink(tmp_file)
 end
@@ -299,5 +301,5 @@ prepare_installation
 run_tests(tests) if InstallOptions.tests
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
-do_bins(bins, Config::CONFIG['bindir'])
+do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)

data/lib/puppet.rb

@@ -1,8 +1,8 @@
 require 'singleton'
 require 'puppet/event-loop'
+require 'puppet/util'
 require 'puppet/log'
 require 'puppet/config'
-require 'puppet/util'
 
 # see the bottom of the file for further inclusions
 
@@ -14,12 +14,23 @@ require 'puppet/util'
 #
 # it's also a place to find top-level commands like 'debug'
 module Puppet
-    PUPPETVERSION = '0.16.0'
+    PUPPETVERSION = '0.18.4'
 
     def Puppet.version
         return PUPPETVERSION
     end
 
+    class << self
+        # So we can monitor signals and such.
+        include SignalObserver
+
+        include Puppet::Util
+
+        # 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
@@ -65,6 +76,9 @@ module Puppet
     # the hash that determines how our system behaves
     @@config = Puppet::Config.new
 
+    # The services running in this process.
+    @services ||= []
+
     # define helper messages for each of the message levels
     Puppet::Log.eachlevel { |level|
         define_method(level,proc { |args|
@@ -100,10 +114,28 @@ module Puppet
         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."],
-        :logdir => ["$vardir/log", "The Puppet log 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,
@@ -209,11 +241,6 @@ module Puppet
         :runinterval => [1800, # 30 minutes
             "How often puppetd applies the client configuration; in seconds"]
     )
-    self.setdefaults("metrics",
-        :rrddir => ["$vardir/rrd",
-            "The directory where RRD database files are stored."],
-        :rrdgraph => [false, "Whether RRD information should be graphed."]
-    )
 
 	# configuration parameter access and stuff
 	def self.[](param)
@@ -264,11 +291,175 @@ module Puppet
         end
     end
 
-    # Start our event loop.  This blocks, waiting for someone, somewhere,
-    # to generate events of some kind.
-    def self.start
-        #Puppet.info "Starting loop"
-        EventLoop.current.run
+    # Run all threads to their ends
+    def self.join
+        defined? @threads and @threads.each do |t| t.join end
+    end
+
+    # Create a new service that we're supposed to run
+    def self.newservice(service)
+        @services ||= []
+
+        @services << service
+    end
+
+    def self.newthread(&block)
+        @threads ||= []
+
+        @threads << Thread.new do
+            yield
+        end
+    end
+
+    def self.newtimer(hash, &block)
+        timer = nil
+        threadlock(:timers) do
+            @timers ||= []
+            timer = EventLoop::Timer.new(hash)
+            @timers << timer
+
+            if block_given?
+                observe_signal(timer, :alarm, &block)
+            end
+        end
+
+        # In case they need it for something else.
+        timer
+    end
+
+    # Relaunch the executable.
+    def self.restart
+        command = $0 + " " + self.args.join(" ")
+        Puppet.notice "Restarting with '%s'" % command
+        Puppet.shutdown(false)
+        exec(command)
+    end
+
+    # Trap a couple of the main signals.  This should probably be handled
+    # in a way that anyone else can register callbacks for traps, but, eh.
+    def self.settraps
+        [:INT, :TERM].each do |signal|
+            trap(signal) do
+                Puppet.notice "Caught #{signal}; shutting down"
+                Puppet.shutdown
+            end
+        end
+
+        # Handle restarting.
+        trap(:HUP) do
+            if client = @services.find { |s| s.is_a? Puppet::Client::MasterClient } and client.running?
+                client.restart
+            else
+                Puppet.restart
+            end
+        end
+
+        # Provide a hook for running clients where appropriate
+        trap(:USR1) do
+            done = 0
+            Puppet.notice "Caught USR1; triggering client run"
+            @services.find_all { |s| s.is_a? Puppet::Client }.each do |client|
+                if client.respond_to? :running?
+                    if client.running?
+                        Puppet.info "Ignoring running %s" % client.class
+                    else
+                        done += 1
+                        begin
+                            client.runnow
+                        rescue => detail
+                            Puppet.err "Could not run client: %s" % detail
+                        end
+                    end
+                else
+                    Puppet.info "Ignoring %s; cannot test whether it is running" %
+                        client.class
+                end
+            end
+
+            unless done > 0
+                Puppet.notice "No clients were run"
+            end
+        end
+    end
+
+    # Shutdown our server process, meaning stop all services and all threads.
+    # Optionally, exit.
+    def self.shutdown(leave = true)
+        Puppet.notice "Shutting down"
+        # Unmonitor our timers
+        defined? @timers and @timers.each do |timer|
+            EventLoop.current.ignore_timer timer
+        end
+
+        # This seems to exit the process, although I can't find where it does
+        # so.  Leaving it out doesn't seem to hurt anything.
+        #if EventLoop.current.running?
+        #    EventLoop.current.quit
+        #end
+
+        # Stop our services
+        defined? @services and @services.each do |svc|
+            begin
+                timeout(20) do
+                    svc.shutdown
+                end
+            rescue TimeoutError
+                Puppet.err "%s could not shut down within 20 seconds" % svc.class
+            end
+        end
+
+        # And wait for them all to die, giving a decent amount of time
+        defined? @threads and @threads.each do |thr|
+            begin
+                timeout(20) do
+                    thr.join
+                end
+            rescue TimeoutError
+                # Just ignore this, since we can't intelligently provide a warning
+            end
+        end
+
+        if leave
+            exit(0)
+        end
+    end
+
+    # Start all of our services and optionally our event loop, which blocks,
+    # 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|
+            newthread do
+                begin
+                    svc.start
+                rescue => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
+                    @services.delete svc
+                    Puppet.err "Could not start %s: %s" % [svc.class, detail]
+                end
+            end
+        end
+
+        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
+            end
+        end
+
+        if block
+            EventLoop.current.run
+        end
     end
 
     # Create the timer that our different objects (uh, mostly the client)
@@ -333,4 +524,4 @@ require 'puppet/server'
 require 'puppet/type'
 require 'puppet/storage'
 
-# $Id: puppet.rb 1094 2006-04-06 06:51:26Z luke $
+# $Id: puppet.rb 1426 2006-07-22 21:10:47Z luke $

data/lib/puppet/client.rb

@@ -9,11 +9,9 @@ module Puppet
     # but at least it's better organized for now
     class Client
         include Puppet
-        include SignalObserver
 
         include Puppet::Util
 
-
         # FIXME The cert stuff should only come up with networking, so it
         # should be in the network client, not the normal client.  But if i do
         # that, it's hard to tell whether the certs have been initialized.
@@ -22,7 +20,8 @@ module Puppet
         attr_accessor :schedule, :lastrun, :local, :stopping
 
         class << self
-            attr_reader :drivername
+            attr_reader :drivername, :handler
+            attr_accessor :netclient
         end
 
         def initcerts
@@ -75,7 +74,17 @@ module Puppet
                     args[:CAFile] = @cacertfile
                 end
 
-                @driver = Puppet::NetworkClient.new(args)
+                netclient = nil
+                unless netclient = self.class.netclient
+                    unless handler = self.class.handler
+                        raise Puppet::DevError,
+                            "Class %s has no handler defined" % self.class
+                    end
+                    namespace = self.class.handler.interface.prefix
+                    netclient = Puppet::NetworkClient.netclient(namespace)
+                    self.class.netclient = netclient
+                end
+                @driver = netclient.new(args)
                 @local = false
             elsif hash.include?(driverparam)
                 @driver = hash[driverparam]
@@ -96,6 +105,9 @@ module Puppet
                 self.run
                 self.lastrun = Time.now.to_i
             rescue => detail
+                if Puppet[:debug]
+                    puts detail.backtrace
+                end
                 Puppet.err "Could not run %s: %s" % [self.class, detail]
             end
         end
@@ -119,39 +131,34 @@ module Puppet
             @driver.ca_file = @cacertfile
         end
 
-        # FIXME this should probably not store every single time.
         def shutdown
             if self.stopping
                 Puppet.notice "Already in shutdown"
             else
                 self.stopping = true
-                Puppet::Storage.store
-                exit
+                if self.respond_to? :running? and self.running?
+                    Puppet::Storage.store
+                end
+                rmpidfile()
             end
         end
 
         # Start listening for events.  We're pretty much just listening for
         # timer events here.
         def start
-            # Create our timer
-            timer = EventLoop::Timer.new(
+            # Create our timer.  Puppet will handle observing it and such.
+            timer = Puppet.newtimer(
                 :interval => Puppet[:runinterval],
                 :tolerance => 1,
                 :start? => true
-            )
-
-            # Stick it in the loop
-            EventLoop.current.monitor_timer timer
-
-            # Run once before we start following the timer
-            self.runnow
-
-            # And run indefinitely
-            observe_signal timer, :alarm do
+            ) do
                 if self.scheduled?
                     self.runnow
                 end
             end
+
+            # Run once before we start following the timer
+            self.runnow
         end
 
         require 'puppet/client/proxy'
@@ -160,8 +167,11 @@ module Puppet
         require 'puppet/client/file'
         require 'puppet/client/log'
         require 'puppet/client/master'
+        require 'puppet/client/runner'
         require 'puppet/client/status'
+        require 'puppet/client/reporter'
+        require 'puppet/client/pelement'
     end
 end
 
-# $Id: client.rb 1098 2006-04-10 22:13:10Z luke $
+# $Id: client.rb 1339 2006-06-29 20:32:17Z luke $