puppet 0.13.6 → 0.16.0

data/lib/puppet.rb

@@ -14,7 +14,7 @@ require 'puppet/util'
 #
 # it's also a place to find top-level commands like 'debug'
 module Puppet
-    PUPPETVERSION = '0.13.6'
+    PUPPETVERSION = '0.16.0'
 
     def Puppet.version
         return PUPPETVERSION
@@ -48,10 +48,6 @@ module Puppet
                 str = @message.to_s
             end
 
-            #if Puppet[:debug] and @stack
-            #    str += @stack.to_s
-            #end
-
             return str
         end
     end
@@ -124,7 +120,6 @@ module Puppet
         },
         :statefile => { :default => "$statedir/state.yaml",
             :mode => 0660,
-            :group => "$group",
             :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
@@ -132,7 +127,7 @@ module Puppet
             },
         :ssldir => {
             :default => "$confdir/ssl",
-            :mode => 0770,
+            :mode => 0771,
             :owner => "root",
             :desc => "Where SSL certificates are kept."
         },
@@ -144,6 +139,7 @@ module Puppet
             "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."]
@@ -190,7 +186,9 @@ module Puppet
             :owner => "root",
             :mode => 0644,
             :desc => "The file in which puppetd stores a list of the classes
-                associated with the retrieved configuratiion."},
+                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,
@@ -335,4 +333,4 @@ require 'puppet/server'
 require 'puppet/type'
 require 'puppet/storage'
 
-# $Id: puppet.rb 969 2006-03-02 20:39:13Z luke $
+# $Id: puppet.rb 1094 2006-04-06 06:51:26Z luke $

data/lib/puppet/client.rb

@@ -11,12 +11,15 @@ module Puppet
         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.
         include Puppet::Daemon
-        attr_reader :local, :secureinit
-        attr_accessor :schedule, :lastrun
+        attr_reader :secureinit
+        attr_accessor :schedule, :lastrun, :local, :stopping
 
         class << self
             attr_reader :drivername
@@ -85,6 +88,10 @@ module Puppet
 
         # A wrapper method to run and then store the last run time
         def runnow
+            if self.stopping
+                Puppet.notice "In shutdown progress; skipping run"
+                return
+            end
             begin
                 self.run
                 self.lastrun = Time.now.to_i
@@ -112,9 +119,15 @@ module Puppet
             @driver.ca_file = @cacertfile
         end
 
+        # FIXME this should probably not store every single time.
         def shutdown
-            Puppet::Storage.store
-            exit
+            if self.stopping
+                Puppet.notice "Already in shutdown"
+            else
+                self.stopping = true
+                Puppet::Storage.store
+                exit
+            end
         end
 
         # Start listening for events.  We're pretty much just listening for
@@ -151,4 +164,4 @@ module Puppet
     end
 end
 
-# $Id: client.rb 897 2006-02-12 18:08:39Z luke $
+# $Id: client.rb 1098 2006-04-10 22:13:10Z luke $

data/lib/puppet/client/dipper.rb

@@ -3,7 +3,10 @@ module Puppet
         # The client class for filebuckets.
         class Dipper < Puppet::Client
             @drivername = :Bucket
+            
+            attr_accessor :name
 
+            # Create our bucket client
             def initialize(hash = {})
                 if hash.include?(:Path)
                     bucket = Puppet::Server::FileBucket.new(
@@ -16,26 +19,25 @@ module Puppet
                 super(hash)
             end
 
+            # Back up a file to our bucket
             def backup(file)
                 unless FileTest.exists?(file)
-                    raise(BucketError, "File %s does not exist" % file, caller)
+                    raise(BucketError, "File %s does not exist" % file)
                 end
-                contents = File.open(file) { |of| of.read }
-
+                contents = File.read(file)
                 string = Base64.encode64(contents)
-                #puts "string is created"
 
                 sum = @driver.addfile(string,file)
-                #puts "file %s is added" % file
+                string = ""
+                contents = ""
                 return sum
             end
 
+            # Restore the file
             def restore(file,sum)
                 restore = true
                 if FileTest.exists?(file)
-                    contents = File.open(file) { |of| of.read }
-
-                    cursum = Digest::MD5.hexdigest(contents)
+                    cursum = Digest::MD5.hexdigest(File.read(file))
 
                     # if the checksum has changed...
                     # this might be extra effort
@@ -48,6 +50,7 @@ module Puppet
                     #puts "Restoring %s" % file
                     if tmp = @driver.getfile(sum)
                         newcontents = Base64.decode64(tmp)
+                        tmp = ""
                         newsum = Digest::MD5.hexdigest(newcontents)
                         changed = nil
                         unless FileTest.writable?(file)
@@ -69,10 +72,9 @@ module Puppet
                 else
                     return nil
                 end
-
             end
         end
     end
 end
 
-# $Id: dipper.rb 848 2006-01-24 06:01:58Z luke $
+# $Id: dipper.rb 1113 2006-04-17 16:15:33Z luke $

data/lib/puppet/client/master.rb

@@ -1,45 +1,53 @@
 # The client for interacting with the puppetmaster config server.
+require 'sync'
+
 class Puppet::Client::MasterClient < Puppet::Client
+    @@sync = Sync.new
+
     Puppet.setdefaults("puppetd",
         :puppetdlockfile => [ "$statedir/puppetdlock",
-            "A lock file to temporarily stop puppetd from doing anything."]
+            "A lock file to temporarily stop puppetd from doing anything."],
+        :usecacheonfailure => [true,
+            "Whether to use the cached configuration when the remote
+            configuration will not compile.  This option is useful for testing
+            new configurations, where you want to fix the broken configuration
+            rather than reverting to a known-good one."
+        ]
+
+
     )
 
     @drivername = :Master
 
+    attr_accessor :objects
+
     def self.facts
         facts = {}
         Facter.each { |name,fact|
             facts[name] = fact.downcase
         }
 
+        # Add our client version to the list of facts, so people can use it
+        # in their manifests
+        facts["clientversion"] = Puppet.version.to_s
+
         facts
     end
 
-    # This method is how the client receives the tree of Transportable
-    # objects.  For now, just descend into the tree and perform and
-    # necessary manipulations.
+    # This method actually applies the configuration.
     def apply
-        Puppet.notice "Beginning configuration run"
         dostorage()
         unless defined? @objects
             raise Puppet::Error, "Cannot apply; objects not defined"
         end
 
-        #Puppet.err :yay
-        #p @objects
-        #Puppet.err :mark
-        #@objects = @objects.to_type
         # this is a gross hack... but i don't see a good way around it
         # set all of the variables to empty
         Puppet::Transaction.init
 
-        # For now we just evaluate the top-level object, but eventually
-        # there will be schedules and such associated with each object,
-        # and probably with the container itself.
         transaction = @objects.evaluate
-        #transaction = Puppet::Transaction.new(objects)
         transaction.toplevel = true
+
         begin
             transaction.evaluate
         rescue Puppet::Error => detail
@@ -59,7 +67,6 @@ class Puppet::Client::MasterClient < Puppet::Client
             Metric.store
             Metric.graph
         end
-        Puppet.notice "Finished configuration run"
 
         return transaction
     end
@@ -85,15 +92,19 @@ class Puppet::Client::MasterClient < Puppet::Client
         @cachefile
     end
 
-    # Disable running the configuration.
-    def disable
-        Puppet.notice "Disabling puppetd"
+    # Disable running the configuration.  This can be used from the command line, but
+    # is also used to make sure only one client is running at a time.
+    def disable(running = false)
+        text = nil
+        if running
+            text = Process.pid
+        else
+            text = ""
+            Puppet.notice "Disabling puppetd"
+        end
         Puppet.config.use(:puppet)
-        #unless FileTest.exists? File.dirname(Puppet[:puppetdlockfile])
-        #    Puppet.recmkdir(File.dirname(Puppet[:puppetdlockfile]))
-        #end
         begin
-            File.open(Puppet[:puppetdlockfile], "w") { |f| f.puts ""; f.flush }
+            File.open(Puppet[:puppetdlockfile], "w") { |f| f.puts text }
         rescue => detail
             raise Puppet::Error, "Could not lock puppetd: %s" % detail
         end
@@ -116,9 +127,12 @@ class Puppet::Client::MasterClient < Puppet::Client
         end
     end
 
-    # Enable running again.
-    def enable
-        Puppet.notice "Enabling puppetd"
+    # Enable running again.  This can be used from the command line, but
+    # is also used to make sure only one client is running at a time.
+    def enable(running = false)
+        unless running
+            Puppet.notice "Enabling puppetd"
+        end
         if FileTest.exists? Puppet[:puppetdlockfile]
             File.unlink(Puppet[:puppetdlockfile])
         end
@@ -171,11 +185,19 @@ class Puppet::Client::MasterClient < Puppet::Client
 
             textfacts = CGI.escape(YAML.dump(facts))
 
-            # error handling for this is done in the network client
-            begin
-                textobjects = @driver.getconfig(textfacts, "yaml")
-            rescue => detail
-                Puppet.err "Could not retrieve configuration: %s" % detail
+            benchmark(:debug, "Retrieved configuration") do
+                # error handling for this is done in the network client
+                begin
+                    textobjects = @driver.getconfig(textfacts, "yaml")
+                rescue => detail
+                    Puppet.err "Could not retrieve configuration: %s" % detail
+
+                    unless Puppet[:usecacheonfailure]
+                        @objects = nil
+                        Puppet.warning "Not using cache on failed configuration"
+                        return
+                    end
+                end
             end
 
             fromcache = false
@@ -186,13 +208,14 @@ class Puppet::Client::MasterClient < Puppet::Client
                         "Cannot connect to server and there is no cached configuration"
                     )
                 end
-                Puppet.notice "Could not get config; using cached copy"
+                Puppet.warning "Could not get config; using cached copy"
                 fromcache = true
+            else
+                @configstamp = Time.now.to_i
             end
 
             begin
                 textobjects = CGI.unescape(textobjects)
-                @configstamp = Time.now.to_i
             rescue => detail
                 raise Puppet::Error, "Could not CGI.unescape configuration"
             end
@@ -215,11 +238,7 @@ class Puppet::Client::MasterClient < Puppet::Client
                 "Invalid returned objects of type %s" % objects.class
         end
 
-        if classes = objects.classes
-            self.setclasses(classes)
-        else
-            Puppet.info "No classes to store"
-        end
+        self.setclasses(objects.classes)
 
         # Clear all existing objects, so we can recreate our stack.
         if defined? @objects
@@ -244,6 +263,37 @@ class Puppet::Client::MasterClient < Puppet::Client
         return @objects
     end
 
+    # Make sure only one client runs at a time, and make sure only one thread
+    # runs at a time.  However, this does not lock local clients -- you could have
+    # as many separate puppet scripts running as you want.
+    def lock
+        if @local
+            yield
+        else
+            @@sync.synchronize(Sync::EX) do
+                disable(true)
+                begin
+                    yield
+                ensure
+                    enable(true)
+                end
+            end
+        end
+    end
+
+    def locked?
+        if FileTest.exists? Puppet[:puppetdlockfile]
+            text = File.read(Puppet[:puppetdlockfile]).chomp
+            if text =~ /\d+/
+                return text
+            else
+                return true
+            end
+        else
+            return false
+        end
+    end
+
     # Retrieve the cached config
     def retrievecache
         if FileTest.exists?(self.cachefile)
@@ -255,16 +305,38 @@ class Puppet::Client::MasterClient < Puppet::Client
 
     # The code that actually runs the configuration.  
     def run
-        if FileTest.exists? Puppet[:puppetdlockfile]
-            Puppet.notice "%s exists; skipping configuration run" %
+        if pid = locked?
+            t = ""
+            if pid == true
+                Puppet.notice "Locked by process %s" % pid
+            end
+            Puppet.notice "Lock file %s exists; skipping configuration run" %
                 Puppet[:puppetdlockfile]
         else
-            self.getconfig
-            self.apply
+            lock do
+                self.getconfig
+
+                if defined? @objects and @objects
+                    unless @local
+                        Puppet.notice "Starting configuration run"
+                    end
+                    benchmark(:notice, "Finished configuration run") do
+                        self.apply
+                    end
+                end
+            end
         end
     end
 
+    # Store the classes in the classfile, but only if we're not local.
     def setclasses(ary)
+        if @local
+            return
+        end
+        unless ary and ary.length > 0
+            Puppet.info "No classes to store"
+            return
+        end
         begin
             File.open(Puppet[:classfile], "w") { |f|
                 f.puts ary.join("\n")
@@ -276,4 +348,4 @@ class Puppet::Client::MasterClient < Puppet::Client
     end
 end
 
-# $Id: master.rb 965 2006-03-02 07:30:14Z luke $
+# $Id: master.rb 1129 2006-04-21 19:14:59Z luke $

data/lib/puppet/client/pelement.rb

@@ -0,0 +1,20 @@
+class Puppet::Client::FileClient < Puppet::Client::ProxyClient
+    @drivername = :FileServer
+
+    # set up the appropriate interface methods
+    @handler = Puppet::Server::FileServer
+
+    self.mkmethods
+
+    def initialize(hash = {})
+        if hash.include?(:FileServer)
+            unless hash[:FileServer].is_a?(Puppet::Server::FileServer)
+                raise Puppet::DevError, "Must pass an actual FS object"
+            end
+        end
+
+        super(hash)
+    end
+end
+
+# $Id: pelement.rb 1123 2006-04-20 05:14:13Z luke $