puppet 0.16.0 → 0.18.4

data/lib/puppet/type/pfile/checksum.rb

@@ -103,7 +103,12 @@ module Puppet
             if hash.include?(sumtype)
                 #self.notice "Found checksum %s for %s" %
                 #    [hash[sumtype] ,@parent[:path]]
-                return hash[sumtype]
+                sum = hash[sumtype]
+
+                unless sum =~ /^\{\w+\}/
+                    sum = "{%s}%s" % [sumtype, sum]
+                end
+                return sum
             elsif hash.empty?
                 #self.notice "Could not find sum of type %s" % sumtype
                 return :nosum
@@ -133,11 +138,13 @@ module Puppet
                     begin
                         File.open(@parent[:path]) { |file|
                             text = nil
-                            if checktype == "md5"
+                            case checktype
+                            when :md5
                                 text = file.read
-                            else
+                            when :md5lite
                                 text = file.read(512)
                             end
+
                             if text.nil?
                                 self.debug "Not checksumming empty file %s" %
                                     @parent[:path]
@@ -215,7 +222,13 @@ module Puppet
         # Even though they can specify multiple checksums, the insync?
         # mechanism can really only test against one, so we'll just retrieve
         # the first specified sum type.
-        def retrieve
+        def retrieve(usecache = false)
+            # When the 'source' is retrieving, it passes "true" here so
+            # that we aren't reading the file twice in quick succession, yo.
+            if usecache and @is
+                return @is
+            end
+
             unless defined? @checktypes
                 @checktypes = ["md5"]
             end
@@ -297,4 +310,4 @@ module Puppet
     end
 end
 
-# $Id: checksum.rb 1126 2006-04-20 20:55:02Z luke $
+# $Id: checksum.rb 1147 2006-04-28 17:19:45Z luke $

data/lib/puppet/type/pfile/content.rb

@@ -3,7 +3,7 @@ module Puppet
         desc "Specify the contents of a file as a string.  Newlines, tabs, and spaces
             can be specified using the escaped syntax (e.g., \\n for a newline).  The
             primary purpose of this parameter is to provide a kind of limited
-            templating::
+            templating:
 
                 define resolve(nameserver1, nameserver2, domain, search) {
                     $str = \"search $search
@@ -67,4 +67,4 @@ module Puppet
     end
 end
 
-# $Id: content.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: content.rb 1300 2006-06-19 19:12:54Z luke $

data/lib/puppet/type/pfile/ensure.rb

@@ -7,7 +7,7 @@ module Puppet
             although currently this will not recursively delete directories.
 
             Anything other than those values will be considered to be a symlink.
-            For instance, the following text creates a link::
+            For instance, the following text creates a link:
                 
                 # Useful on solaris
                 file { \"/etc/inetd.conf\":
@@ -82,7 +82,7 @@ module Puppet
                     self.set_directory
                     return :directory_created
                 else
-                    return state.sync
+                    return state.mklink
                 end
             else
                 self.fail "Cannot create a symlink without a target"
@@ -152,4 +152,4 @@ module Puppet
     end
 end
 
-# $Id: ensure.rb 1123 2006-04-20 05:14:13Z luke $
+# $Id: ensure.rb 1300 2006-06-19 19:12:54Z luke $

data/lib/puppet/type/pfile/group.rb

@@ -88,7 +88,7 @@ module Puppet
                 self.retrieve
 
                 if @is == :absent
-                    self.info "File '%s' does not exist; cannot chgrp" %
+                    self.debug "File '%s' does not exist; cannot chgrp" %
                         @parent[:path]
                     return nil
                 end
@@ -116,4 +116,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 988 2006-03-06 19:54:59Z luke $
+# $Id: group.rb 1384 2006-07-11 16:53:59Z luke $

data/lib/puppet/type/pfile/source.rb

@@ -1,7 +1,9 @@
+require 'puppet/server/fileserver'
+
 module Puppet
     # Copy files from a local or remote source.
     Puppet.type(:file).newstate(:source) do
-        PINPARAMS = [:mode, :type, :owner, :group, :checksum]
+        PINPARAMS = Puppet::Server::FileServer::CHECKPARAMS
 
         attr_accessor :source, :local
         desc "Copy a file over the current file.  Uses ``checksum`` to
@@ -12,7 +14,7 @@ module Puppet
             This is one of the primary mechanisms for getting content into
             applications that Puppet does not directly support and is very
             useful for those configuration files that don't change much across
-            sytems.  For instance::
+            sytems.  For instance:
 
                 class sendmail {
                     file { \"/etc/mail/sendmail.cf\":
@@ -20,11 +22,11 @@ module Puppet
                     }
                 }
             
-            See the `fileserver docs`_ for information on how to configure
+            See the [fileserver docs][] for information on how to configure
             and use file services within Puppet.
 
 
-            .. _fileserver docs: /projects/puppet/documentation/fsconfigref
+            [fileserver docs]: fsconfigref.html
 
             "
 
@@ -71,7 +73,7 @@ module Puppet
         # of the local states appropriately.  If the remote file is a normal
         # file then we set it to copy; if it's a directory, then we just mark
         # that the local directory should be created.
-        def retrieve
+        def retrieve(remote = true)
             sum = nil
 
             unless defined? @shouldorig
@@ -79,16 +81,21 @@ module Puppet
                     @parent.name
             end
 
-            @source = nil
-            
-            # Find the first source that exists.  @shouldorig contains
-            # the sources as specified by the user.
-            @shouldorig.each { |source|
-                if @stats = self.describe(source)
-                    @source = source
-                    break
-                end
-            }
+            @source = nil unless defined? @source
+
+            # This is set to false by the File#retrieve function on the second
+            # retrieve, so that we do not do two describes.
+            if remote
+                @source = nil
+                # Find the first source that exists.  @shouldorig contains
+                # the sources as specified by the user.
+                @shouldorig.each { |source|
+                    if @stats = self.describe(source)
+                        @source = source
+                        break
+                    end
+                }
+            end
 
             if @stats.nil? or @stats[:type].nil?
                 @is = :notdescribed
@@ -102,7 +109,7 @@ module Puppet
                 if sum = @parent.state(:checksum)
                     if sum.is
                         if sum.is == :absent
-                            sum.retrieve
+                            sum.retrieve(true)
                         end
                         @is = sum.is
                     else
@@ -176,6 +183,10 @@ module Puppet
         # here doesn't really matter, because the @should values will be
         # overridden when we 'retrieve'.
         munge do |source|
+            if source.is_a? Symbol
+                return source
+            end
+
             # Remove any trailing slashes
             source.sub!(/\/$/, '')
             unless @parent.uri2obj(source)
@@ -256,4 +267,4 @@ module Puppet
     end
 end
 
-# $Id: source.rb 1123 2006-04-20 05:14:13Z luke $
+# $Id: source.rb 1300 2006-06-19 19:12:54Z luke $

data/lib/puppet/type/pfile/target.rb

@@ -12,32 +12,40 @@ module Puppet
 
         # Anything else, basically
         newvalue(/./) do
+            if @parent.state(:ensure).insync?
+                mklink()
+            end
+        end
+
+        # Create our link.
+        def mklink
             target = self.should
 
             if stat = @parent.stat
-                unless stat.ftype == "link"
-                    self.fail "Not replacing non-symlink"
+                unless @parent.handlebackup
+                    self.fail "Could not back up; will not replace with link"
+                end
+
+                case stat.ftype
+                when "directory":
+                    FileUtils.rmtree(@parent[:path])
+                else
+                    File.unlink(@parent[:path])
                 end
-                File.unlink(@parent[:path])
             end
             Dir.chdir(File.dirname(@parent[:path])) do
-                unless FileTest.exists?(target)
-                    self.debug "Not linking to non-existent '%s'" % target
-                    :nochange # Grrr, can't return
-                else
-                    Puppet::Util.asuser(@parent.asuser()) do
-                        mode = @parent.should(:mode)
-                        if mode
-                            Puppet::Util.withumask(000) do
-                                File.symlink(target, @parent[:path])
-                            end
-                        else
+                Puppet::Util.asuser(@parent.asuser()) do
+                    mode = @parent.should(:mode)
+                    if mode
+                        Puppet::Util.withumask(000) do
                             File.symlink(target, @parent[:path])
                         end
+                    else
+                        File.symlink(target, @parent[:path])
                     end
-
-                    :link_created
                 end
+
+                :link_created
             end
         end
 
@@ -78,4 +86,4 @@ module Puppet
     end
 end
 
-# $Id: target.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: target.rb 1303 2006-06-20 01:34:24Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -2,8 +2,6 @@ require 'puppet/server/filebucket'
 
 module Puppet
     newtype(:filebucket) do
-        attr_reader :bucket
-
         @doc = "A repository for backing up files.  If no filebucket is
             defined, then files will be backed up in their current directory,
             but the filebucket can be either a host- or site-global repository
@@ -16,7 +14,20 @@ module Puppet
             accidentally removed files (e.g., you look in the log for the md5
             sum and retrieve the file with that sum from the filebucket), but
             when transactions are fully supported filebuckets will be used to
-            undo transactions."
+            undo transactions.
+            
+            You will normally want to define a single filebucket for your
+            whole network and then use that as the default backup location:
+            
+                # Define the bucket
+                filebucket { main: server => puppet }
+
+                # Specify it as the default target
+                File { backup => main }
+
+            Puppetmaster servers create a filebucket by default, so this will
+            work in a default configuration.
+            "
 
         @states = []
 
@@ -42,6 +53,8 @@ module Puppet
             desc "The path to the local filebucket.  If this is
                 not specified, then the bucket is remote and *server* must be
                 specified."
+
+            defaultto { Puppet[:bucketdir] }
         end
 
         # get the actual filebucket object
@@ -57,9 +70,15 @@ module Puppet
             self.collect do |obj| obj.name end
         end
 
-        def initialize(hash)
-            super
+        def bucket
+            unless defined? @bucket
+                mkbucket()
+            end
+
+            @bucket
+        end
 
+        def mkbucket
             if self[:server]
                 begin
                     @bucket = Puppet::Client::Dipper.new( 
@@ -91,4 +110,4 @@ module Puppet
     end
 end
 
-# $Id: pfilebucket.rb 1124 2006-04-20 07:00:10Z luke $
+# $Id: pfilebucket.rb 1373 2006-07-06 04:39:59Z luke $

data/lib/puppet/type/schedule.rb

@@ -16,7 +16,7 @@ module Puppet
             Thus, it behooves you to use wider scheduling (e.g., over a couple of
             hours) combined with periods and repetitions.  For instance, if you
             wanted to restrict certain elements to only running once, between
-            the hours of two and 4 AM, then you would use this schedule::
+            the hours of two and 4 AM, then you would use this schedule:
                 
                 schedule { maint:
                     range => \"2 - 4\",
@@ -33,7 +33,7 @@ module Puppet
             Puppet automatically creates a schedule for each valid period with the
             same name as that period (e.g., hourly and daily).  Additionally,
             a schedule named *puppet* is created and used as the default,
-            with the following attributes::
+            with the following attributes:
 
                 schedule { puppet:
                     period => hourly,
@@ -47,7 +47,7 @@ module Puppet
 
         newparam(:name) do
             desc "The name of the schedule.  This name is used to retrieve the
-                schedule when assigning it to an object::
+                schedule when assigning it to an object:
                     
                     schedule { daily:
                         period => daily,
@@ -67,7 +67,7 @@ module Puppet
                 is always a range within a 24 hour period, and hours must be
                 specified in numbers between 0 and 23, inclusive.  Minutes and
                 seconds can be provided, using the normal colon as a separator.
-                For instance::
+                For instance:
 
                     schedule { maintenance:
                         range => \"1:30 - 4:30\"
@@ -200,7 +200,7 @@ module Puppet
                 If the provided periods are not sufficient, you can provide a
                 value to the *repeat* attribute, which will cause Puppet to
                 schedule the affected elements evenly in the period the
-                specified number of times.  Take this schedule::
+                specified number of times.  Take this schedule:
 
                     schedule { veryoften:
                         period => hourly,
@@ -342,4 +342,4 @@ module Puppet
     end
 end
 
-# $Id: schedule.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: schedule.rb 1300 2006-06-19 19:12:54Z luke $

data/lib/puppet/type/service.rb

@@ -29,7 +29,7 @@ module Puppet
             newvalue(:true) do
                 unless @parent.respond_to?(:enable)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        self.name
+                        @parent.name
                 end
                 @parent.enable
             end
@@ -37,7 +37,7 @@ module Puppet
             newvalue(:false) do
                 unless @parent.respond_to?(:disable)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        self.name
+                        @parent.name
                 end
                 @parent.disable
             end
@@ -45,7 +45,7 @@ module Puppet
             def retrieve
                 unless @parent.respond_to?(:enabled?)
                     raise Puppet::Error, "Service %s does not support enabling" %
-                        self.name
+                        @parent.name
                 end
                 @is = @parent.enabled?
             end
@@ -154,11 +154,11 @@ module Puppet
                 sense to set this parameter, as the default is based on
                 the builtin service facilities.  The service types available are:
                 
-                * ``base``: You must specify everything.
-                * ``init``: Assumes ``start`` and ``stop`` commands exist, but you
+                * **base**: You must specify everything.
+                * **init**: Assumes ``start`` and ``stop`` commands exist, but you
                   must specify everything else.
-                * ``debian``: Debian's own specific version of ``init``.
-                * ``smf``: Solaris 10's new Service Management Facility.
+                * **debian**: Debian's own specific version of ``init``.
+                * **smf**: Solaris 10's new Service Management Facility.
                 "
 
             defaultto { @parent.class.defaulttype }
@@ -219,11 +219,13 @@ module Puppet
                     if FileTest.directory?(path)
                         next
                     end
-                    unless FileTest.directory?(path)
-                        @parent.info("Search path %s is not a directory" % [path])
-                    end
-                    unless FileTest.exists?(path)
-                        @parent.info("Search path %s does not exist" % [path])
+                    if FileTest.exists?(path)
+                        unless FileTest.directory?(path)
+                            @parent.debug "Search path %s is not a directory" %
+                                [path]
+                        end
+                    else
+                        @parent.debug("Search path %s does not exist" % [path])
                     end
                     paths.delete(path)
                 end
@@ -242,7 +244,10 @@ module Puppet
                 of a service, then the service name will be used instead.
                 
                 The pattern can be a simple string or any legal Ruby pattern."
-            defaultto { @parent[:name] }
+
+            defaultto {
+                @parent[:binary] || @parent[:name]
+            }
         end
         newparam(:restart) do
             desc "Specify a *restart* command manually.  If left
@@ -374,6 +379,9 @@ module Puppet
 
             mod.module_eval(&block)
 
+            # Extend the service type with the util stuff
+            mod.send(:include, Puppet::Util)
+
             #unless mod.respond_to? :list
             #    Puppet.debug "Service type %s has no list method" % name
             #end
@@ -454,6 +462,7 @@ module Puppet
                 )
             end
             regex = Regexp.new(self[:pattern])
+            self.debug "Executing '#{ps}'"
             IO.popen(ps) { |table|
                 table.each { |line|
                     if regex.match(line)
@@ -519,6 +528,7 @@ module Puppet
                     return :stopped
                 end
             elsif pid = self.getpid
+                self.debug "PID is %s" % pid
                 return :running
             else
                 return :stopped
@@ -566,4 +576,4 @@ require 'puppet/type/service/debian'
 require 'puppet/type/service/redhat'
 require 'puppet/type/service/smf'
 
-# $Id: service.rb 1125 2006-04-20 19:38:48Z luke $
+# $Id: service.rb 1295 2006-06-17 02:04:50Z luke $