puppet 0.13.6 → 0.16.0

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

@@ -40,11 +40,18 @@ module Puppet
         def retrieve
             stat = @parent.stat(false)
 
-            if stat
-                self.is = stat.gid
-            else
+            unless stat
                 self.is = :absent
+                return
+            end
+
+            # Set our method appropriately, depending on links.
+            if stat.ftype == "link" and @parent[:links] != :follow
+                @method = :lchown
+            else
+                @method = :chown
             end
+            self.is = stat.gid
         end
 
         # Determine if the group is valid, and if so, return the UID
@@ -98,7 +105,7 @@ module Puppet
 
             begin
                 # set owner to nil so it's ignored
-                File.chown(nil,gid,@parent[:path])
+                File.send(@method,nil,gid,@parent[:path])
             rescue => detail
                 error = Puppet::Error.new( "failed to chgrp %s to %s: %s" %
                     [@parent[:path], self.should, detail.message])
@@ -109,4 +116,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 965 2006-03-02 07:30:14Z luke $
+# $Id: group.rb 988 2006-03-06 19:54:59Z luke $

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

@@ -40,7 +40,8 @@ module Puppet
             value = should
             if value.is_a?(String)
                 unless value =~ /^[0-9]+$/
-                    raise Puppet::Error, "File modes can only be numbers"
+                    raise Puppet::Error, "File modes can only be numbers, not %s" %
+                        value.inspect
                 end
                 unless value =~ /^0/
                     value = "0" + value
@@ -74,7 +75,19 @@ module Puppet
             return value
         end
 
+        def insync?
+            if stat = @parent.stat and stat.ftype == "link" and @parent[:links] != :follow
+                self.debug "Not managing symlink mode"
+                return true
+            else
+                return super
+            end
+        end
+
         def retrieve
+            # If we're not following links and we're a link, then we just turn
+            # off mode management entirely.
+
             if stat = @parent.stat(false)
                 self.is = stat.mode & 007777
                 unless defined? @fixed
@@ -94,8 +107,7 @@ module Puppet
                 @parent.stat(true)
                 self.retrieve
                 if @is == :absent
-                    self.debug "File does not exist; cannot set mode" %
-                        @parent[:path]
+                    self.debug "File does not exist; cannot set mode"
                     return nil
                 end
 
@@ -124,4 +136,4 @@ module Puppet
     end
 end
 
-# $Id: mode.rb 965 2006-03-02 07:30:14Z luke $
+# $Id: mode.rb 1056 2006-04-03 18:05:58Z luke $

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

@@ -4,7 +4,7 @@ module Puppet
         PINPARAMS = [:mode, :type, :owner, :group, :checksum]
 
         attr_accessor :source, :local
-        desc "Copy a file over the current file.  Uses `checksum` to
+        desc "Copy a file over the current file.  Uses ``checksum`` to
             determine when a file should be copied.  Valid values are either
             fully qualified paths to files, or URIs.  Currently supported URI
             types are *puppet* and *file*.
@@ -28,13 +28,15 @@ module Puppet
 
             "
 
+        uncheckable
+
         # Ask the file server to describe our file.
         def describe(source)
             sourceobj, path = @parent.uri2obj(source)
             server = sourceobj.server
 
             begin
-                desc = server.describe(path)
+                desc = server.describe(path, @parent[:links])
             rescue NetworkClientError => detail
                 self.err "Could not describe %s: %s" %
                     [path, detail]
@@ -94,23 +96,6 @@ module Puppet
                 return nil
             end
 
-            # Take each of the stats and set them as states on the local file
-            # if a value has not already been provided.
-            @stats.each { |stat, value|
-                next if stat == :checksum
-                next if stat == :type
-
-                # was the stat already specified, or should the value
-                # be inherited from the source?
-                unless @parent.argument?(stat)
-                    if state = @parent.state(stat)
-                        state.should = value
-                    else
-                        @parent[stat] = value
-                    end
-                end
-            }
-
             # If we're a normal file, then set things up to copy the file down.
             case @stats[:type]
             when "file":
@@ -143,13 +128,47 @@ module Puppet
                 # we'll let the :ensure state do our work
                 @should.clear
                 @is = true
-            # FIXME We should at least support symlinks, I would think...
+            when "link":
+                case @parent[:links]
+                when :ignore
+                    @is = :nocopy
+                    @should = [:nocopy]
+                    self.info "Ignoring link %s" % @source
+                    return
+                when :follow
+                    @stats = self.describe(source, :follow)
+                    if @stats.empty?
+                        raise Puppet::Error, "Could not follow link %s" % @source
+                    end
+                when :copy
+                    raise Puppet::Error, "Cannot copy links yet"
+                end
             else
+                self.info @stats.inspect
                 self.err "Cannot use files of type %s as sources" %
                     @stats[:type]
-                @should = nil
-                @is = true
+                @should = [:nocopy]
+                @is = :nocopy
             end
+
+            # Take each of the stats and set them as states on the local file
+            # if a value has not already been provided.
+            @stats.each { |stat, value|
+                next if stat == :checksum
+                next if stat == :type
+
+                # was the stat already specified, or should the value
+                # be inherited from the source?
+                unless @parent.argument?(stat)
+                    if state = @parent.state(stat)
+                        state.should = value
+                    else
+                        @parent[stat] = value
+                    end
+                #else
+                #    @parent.info "Already specified %s" % stat
+                end
+            }
         end
 
         # The special thing here is that we need to make sure that 'should'
@@ -189,6 +208,9 @@ module Puppet
                 end
             end
 
+            case @stats[:type]
+            when "link":
+            end
             unless @stats[:type] == "file"
                 #if @stats[:type] == "directory"
                         #[@parent.name, @is.inspect, @should.inspect]
@@ -204,7 +226,7 @@ module Puppet
             sourceobj, path = @parent.uri2obj(@source)
 
             begin
-                contents = sourceobj.server.retrieve(path)
+                contents = sourceobj.server.retrieve(path, @parent[:links])
             rescue NetworkClientError => detail
                 self.err "Could not retrieve %s: %s" %
                     [path, detail]
@@ -221,57 +243,9 @@ module Puppet
                 self.notice "Could not retrieve contents for %s" %
                     @source
             end
-
-            if FileTest.exists?(@parent[:path])
-                # this makes sure we have a copy for posterity
-                @backed = @parent.handlebackup
-            end
-
-            # create the file in a tmp location
-            args = [@parent[:path] + ".puppettmp", 
-                File::CREAT | File::WRONLY | File::TRUNC]
-
-            # try to create it with the correct modes to start
-            # we should also be changing our effective uid/gid, but...
-            if @parent.should(:mode) and @parent.should(:mode) != :absent
-                args.push @parent.should(:mode)
-            end
-
-            # FIXME we should also change our effective user and group id
-
             exists = File.exists?(@parent[:path])
-            begin
-                File.open(*args) { |f|
-                    f.print contents
-                }
-            rescue => detail
-                # since they said they want a backup, let's error out
-                # if we couldn't make one
-                raise Puppet::Error, "Could not create %s to %s: %s" %
-                    [@source, @parent[:path], detail.message]
-            end
-
-            if FileTest.exists?(@parent[:path])
-                begin
-                    File.unlink(@parent[:path])
-                rescue => detail
-                    self.err "Could not remove %s for replacing: %s" %
-                        [@parent[:path], detail]
-                end
-            end
 
-            begin
-                File.rename(@parent[:path] + ".puppettmp", @parent[:path])
-            rescue => detail
-                self.err "Could not rename tmp %s for replacing: %s" %
-                    [@parent[:path], detail]
-            end
-
-            if @stats.include? :checksum
-                @parent.setchecksum @stats[:checksum]
-            else
-                raise Puppet::DevError, "We're somehow missing the remote checksum"
-            end
+            @parent.write { |f| f.print contents }
 
             if exists
                 return :file_changed
@@ -282,4 +256,4 @@ module Puppet
     end
 end
 
-# $Id: source.rb 944 2006-02-24 22:50:23Z luke $
+# $Id: source.rb 1123 2006-04-20 05:14:13Z luke $

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

@@ -0,0 +1,81 @@
+module Puppet
+    Puppet.type(:file).newstate(:target) do
+        attr_accessor :linkmaker
+
+        desc "The target for creating a link.  Currently, symlinks are the
+            only type supported."
+
+        newvalue(:notlink) do
+            # We do nothing if the value is absent
+            return :nochange
+        end
+
+        # Anything else, basically
+        newvalue(/./) do
+            target = self.should
+
+            if stat = @parent.stat
+                unless stat.ftype == "link"
+                    self.fail "Not replacing non-symlink"
+                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
+                            File.symlink(target, @parent[:path])
+                        end
+                    end
+
+                    :link_created
+                end
+            end
+        end
+
+        def retrieve
+            if @parent.state(:ensure).should == :directory
+                @is = self.should
+                @linkmaker = true
+            else
+                if stat = @parent.stat
+                    # If we're just checking the value
+                    if (should = self.should) and
+                            (should != :notlink) and
+                            File.exists?(should) and
+                            (tstat = File.lstat(should)) and
+                            (tstat.ftype == "directory") and
+                            @parent.recurse?
+                        unless @parent.recurse?
+                            raise "wtf?"
+                        end
+                        warning "Changing ensure to directory; recurse is %s but %s" %
+                            [@parent[:recurse].inspect, @parent.recurse?]
+                        @parent[:ensure] = :directory
+                        @is = should
+                        @linkmaker = true
+                    else
+                        if stat.ftype == "link"
+                            @is = File.readlink(@parent[:path])
+                            @linkmaker = false
+                        else
+                            @is = :notlink
+                        end
+                    end
+                else
+                    @is = :absent
+                end
+            end
+        end
+    end
+end
+
+# $Id: target.rb 1125 2006-04-20 19:38:48Z luke $

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

@@ -85,6 +85,13 @@ module Puppet
                 return
             end
 
+            # Set our method appropriately, depending on links.
+            if stat.ftype == "link" and @parent[:links] != :follow
+                @method = :lchown
+            else
+                @method = :chown
+            end
+
             self.is = stat.uid
 
             # On OS X, files that are owned by -2 get returned as really
@@ -139,7 +146,7 @@ module Puppet
                 @parent.stat(true)
                 self.retrieve
                 if @is == :absent
-                    self.info "File does not exist; cannot set owner"
+                    self.debug "File does not exist; cannot set owner"
                     return nil
                 end
                 if self.insync?
@@ -149,7 +156,7 @@ module Puppet
             end
 
             begin
-                File.chown(user, nil, @parent[:path])
+                File.send(@method, user, nil, @parent[:path])
             rescue => detail
                 raise Puppet::Error, "Failed to set owner to '%s': %s" %
                     [user, detail]
@@ -160,4 +167,4 @@ module Puppet
     end
 end
 
-# $Id: uid.rb 862 2006-01-31 02:07:56Z luke $
+# $Id: uid.rb 994 2006-03-08 22:57:21Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -46,8 +46,15 @@ module Puppet
 
         # get the actual filebucket object
         def self.bucket(name)
-            oname, object = @objects.find { |oname, o| oname == name }
-            return object.bucket
+            if object = self[name]
+                return object.bucket
+            else
+                return nil
+            end
+        end
+
+        def self.list
+            self.collect do |obj| obj.name end
         end
 
         def initialize(hash)
@@ -78,8 +85,10 @@ module Puppet
                     )
                 end
             end
+
+            @bucket.name = self.name
         end
     end
 end
 
-# $Id: pfilebucket.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: pfilebucket.rb 1124 2006-04-20 07:00:10Z luke $

data/lib/puppet/type/schedule.rb

@@ -295,6 +295,10 @@ module Puppet
             end
         end
 
+        def self.list
+            self.collect do |obj| obj end
+        end
+
         def self.mkdefaultschedules
             Puppet.debug "Creating default schedules"
             # Create our default schedule
@@ -338,4 +342,4 @@ module Puppet
     end
 end
 
-# $Id: schedule.rb 922 2006-02-16 19:10:34Z luke $
+# $Id: schedule.rb 1125 2006-04-20 19:38:48Z luke $

data/lib/puppet/type/service.rb

@@ -28,21 +28,24 @@ module Puppet
 
             newvalue(:true) do
                 unless @parent.respond_to?(:enable)
-                    raise Puppet::Error, "Service %s does not support enabling"
+                    raise Puppet::Error, "Service %s does not support enabling" %
+                        self.name
                 end
                 @parent.enable
             end
 
             newvalue(:false) do
                 unless @parent.respond_to?(:disable)
-                    raise Puppet::Error, "Service %s does not support enabling"
+                    raise Puppet::Error, "Service %s does not support enabling" %
+                        self.name
                 end
                 @parent.disable
             end
 
             def retrieve
                 unless @parent.respond_to?(:enabled?)
-                    raise Puppet::Error, "Service %s does not support enabling"
+                    raise Puppet::Error, "Service %s does not support enabling" %
+                        self.name
                 end
                 @is = @parent.enabled?
             end
@@ -104,23 +107,8 @@ module Puppet
             aliasvalue(:false, :stopped)
             aliasvalue(:true, :running)
 
-#            munge do |should|
-#                case should
-#                when false,0,"0", "stopped", :stopped:
-#                    should = :stopped
-#                when true,1,"1", :running, "running":
-#                    should = :running
-#                else
-#                    self.warning "%s: interpreting '%s' as false" %
-#                        [self.class,should.inspect]
-#                    should = 0
-#                end
-#                return should
-#            end
-
             def retrieve
                 self.is = @parent.status
-                self.debug "Running value is '%s'" % self.is
             end
 
             def sync
@@ -128,16 +116,23 @@ module Puppet
                 case self.should
                 when :running
                     @parent.start
-                    self.info "started"
-                    return :service_started
+                    event = :service_started
                 when :stopped
-                    self.info "stopped"
                     @parent.stop
-                    return :service_stopped
+                    event = :service_stopped
                 else
                     self.debug "Not running '%s' and shouldn't be running" %
                         self
                 end
+
+                if state = @parent.state(:enable)
+                    state.retrieve
+                    unless state.insync?
+                        state.sync
+                    end
+                end
+
+                return event
             end
         end
 
@@ -148,9 +143,9 @@ module Puppet
                 of this, but using this will still work, albeit with a
                 warning."
 
-            def should=(values)
+            munge do |value|
                 @parent.warning "'running' is deprecated; please use 'ensure'"
-                @parent[:ensure] = values
+                @parent[:ensure] = value
             end
         end
 
@@ -172,11 +167,14 @@ module Puppet
             # representing the module.
             munge do |type|
                 if type.is_a?(String)
-                    type = @parent.class.svctype(type.intern)
+                    type = type.intern
                 end
-                Puppet.debug "Service type is %s" % type.name
-                @parent.extend(type)
+                if type.is_a?(Symbol)
+                    typeklass = @parent.class.svctype(type)
+                end
+                @parent.extend(typeklass)
 
+                # Return the name, not the object
                 return type
             end
         end
@@ -258,7 +256,7 @@ module Puppet
         newparam(:status) do
             desc "Specify a *status* command manually.  If left
                 unspecified, the status method will be determined
-                automatically, usually by looking for the service int he
+                automatically, usually by looking for the service in the
                 process table."
         end
 
@@ -266,6 +264,79 @@ module Puppet
             desc "Specify a *stop* command manually."
         end
 
+        # Retrieve the default type for the current platform.
+        def self.defaulttype
+            unless defined? @defsvctype
+                @defsvctype = nil
+                os = Facter["operatingsystem"].value
+                case os
+                when "Debian":
+                    @defsvctype = self.svctype(:debian)
+                when "Solaris":
+                    release = Facter["operatingsystemrelease"].value
+                    if release.sub(/5\./,'').to_i < 10
+                        @defsvctype = self.svctype(:init)
+                    else
+                        @defsvctype = self.svctype(:smf)
+                    end
+                when "CentOS", "RedHat", "Fedora":
+                    @defsvctype = self.svctype(:redhat)
+                else
+                    if Facter["kernel"] == "Linux"
+                        Puppet.notice "Using service type %s for %s" %
+                            ["init", Facter["operatingsystem"].value]
+                        @defsvctype = self.svctype(:init)
+                    end
+                end
+
+                unless @defsvctype
+                    Puppet.info "Defaulting to base service type"
+                    @defsvctype = self.svctype(:base)
+                end
+            end
+
+            unless defined? @notifieddefault
+                Puppet.debug "Default service type is %s" % @defsvctype.name
+                @notifieddefault = true
+            end
+
+            return @defsvctype.name
+        end
+
+        # List all available services
+        def self.list
+            # First see if the default service type can list services for us
+            deftype = svctype(defaulttype())
+
+            names = []
+            if deftype.respond_to? :list
+                deftype.list(deftype.name)
+            else
+                Puppet.debug "Type %s does not respond to list" % deftype.name
+            end
+
+            self.collect { |s| s }
+        end
+
+        # Add a new path to our list of paths that services could be in.
+        def self.newpath(type, path)
+            type = type.intern if type.is_a? String
+            @paths ||= {}
+            @paths[type] ||= []
+
+            unless @paths[type].include? path
+                @paths[type] << path
+            end
+        end
+
+        def self.paths(type)
+            type = type.intern if type.is_a? String
+            @paths ||= {}
+            @paths[type] ||= []
+
+            @paths[type].dup
+        end
+
         # Create new subtypes of service management.
         def self.newsvctype(name, parent = nil, &block)
             if parent
@@ -303,6 +374,27 @@ module Puppet
 
             mod.module_eval(&block)
 
+            #unless mod.respond_to? :list
+            #    Puppet.debug "Service type %s has no list method" % name
+            #end
+
+            # "module_function" makes the :list method private, so if the parent
+            # method also called module_function, then it's already private
+            if mod.public_method_defined? :list or mod.private_method_defined? :list
+                mod.send(:module_function, :list)
+            end
+
+            # mark it as a valid type
+            unless defined? @typeparam
+                @typeparam = @parameters.find { |p| p.name == :type }
+
+                unless @typeparam
+                    raise Puppet::DevError, "Could not package type parameter"
+                end
+            end
+            @typeparam.newvalues(name)
+
+            # And add it to our list of types
             @modules ||= Hash.new do |hash, key|
                 if key.is_a?(String)
                     key = key.intern
@@ -319,49 +411,29 @@ module Puppet
 
         # Retrieve a service type.
         def self.svctype(name)
-            @modules[name]
-        end
-
-        # Retrieve the default type for the current platform.
-        def self.defaulttype
-            unless defined? @defsvctype
-                @defsvctype = nil
-                os = Facter["operatingsystem"].value
-                case os
-                when "Debian":
-                    @defsvctype = self.svctype(:debian)
-                when "Solaris":
-                    release = Facter["operatingsystemrelease"].value
-                    if release.sub(/5\./,'').to_i < 10
-                        @defsvctype = self.svctype(:init)
-                    else
-                        @defsvctype = self.svctype(:smf)
-                    end
-                when "CentOS", "RedHat", "Fedora":
-                    @defsvctype = self.svctype(:redhat)
-                else
-                    if Facter["kernel"] == "Linux"
-                        Puppet.notice "Using service type %s for %s" %
-                            ["init", Facter["operatingsystem"].value]
-                        @defsvctype = self.svctype(:init)
+            name = name.intern if name.is_a? String
+
+            # Try autoloading lacking service types.
+            unless @modules.include? name
+                begin
+                    require "puppet/type/service/#{name}"
+                    unless @modules.include? name
+                        Puppet.warning(
+                            "Loaded puppet/type/service/#{name} but " +
+                            "service type was not created"
+                        )
                     end
-                end
-
-                unless @defsvctype
-                    Puppet.notice "Defaulting to base service type"
-                    @defsvctype = self.svctype(:base)
+                rescue LoadError
+                    # nothing
                 end
             end
-
-            Puppet.debug "Default service type is %s" % @defsvctype.name
-
-            return @defsvctype
+            @modules[name]
         end
 
         # Execute a command.  Basically just makes sure it exits with a 0
         # code.
         def execute(type, cmd)
-            self.info "Executing %s" % cmd.inspect
+            self.debug "Executing %s" % cmd.inspect
             output = %x(#{cmd} 2>&1)
             unless $? == 0
                 self.fail "Could not %s %s: %s" %
@@ -437,7 +509,7 @@ module Puppet
                 self.respond_to?(:statuscmd) and self.statuscmd
             )
                 cmd = self[:status] || self.statuscmd
-                self.info "Executing %s" % cmd.inspect
+                self.debug "Executing %s" % cmd.inspect
                 output = %x(#{cmd} 2>&1)
                 self.debug "%s status returned %s" %
                     [self.name, output.inspect]
@@ -475,7 +547,7 @@ module Puppet
                     self.info "%s is not running" % self.name
                     return false
                 end
-                output = %x("kill #{pid} 2>&1")
+                output = %x(kill #{pid} 2>&1)
                 if $? != 0
                     self.fail "Could not kill %s, PID %s: %s" %
                             [self.name, pid, output]
@@ -494,4 +566,4 @@ require 'puppet/type/service/debian'
 require 'puppet/type/service/redhat'
 require 'puppet/type/service/smf'
 
-# $Id: service.rb 938 2006-02-24 20:01:01Z luke $
+# $Id: service.rb 1125 2006-04-20 19:38:48Z luke $