puppet 0.23.2 → 0.24.0

data/lib/puppet/type/cron.rb

@@ -348,7 +348,7 @@ Puppet::Type.newtype(:cron) do
             
             The user defaults to whomever Puppet is running as."
 
-        defaultto { ENV["USER"] || "root" }
+        defaultto { Etc.getpwuid(Process.uid).name || "root" }
     end
 
     newproperty(:target) do
@@ -408,5 +408,4 @@ Puppet::Type.newtype(:cron) do
 end
 
 
-# $Id: cron.rb 2698 2007-07-14 21:18:36Z luke $
 

data/lib/puppet/type/exec.rb

@@ -113,15 +113,16 @@ module Puppet
                     self.fail "Command exceeded timeout" % value.inspect
                 end
 
-                loglevel = @resource[:loglevel]
-                if status.exitstatus.to_s != self.should.to_s
-                    self.fail("%s returned %s instead of %s" %
-                        [self.resource[:command], status.exitstatus, self.should.to_s])
-                end
-
                 if log = @resource[:logoutput]
-                    if log == :true
+                    case log 
+                    when :true 
                         log = @resource[:loglevel]
+                    when :on_failure
+                        if status.exitstatus.to_s != self.should.to_s
+                            log = @resource[:loglevel]
+                        else
+                            log = :false
+                        end
                     end
                     unless log == :false
                         @output.split(/\n/).each { |line|
@@ -130,6 +131,11 @@ module Puppet
                     end
                 end
 
+                if status.exitstatus.to_s != self.should.to_s
+                    self.fail("%s returned %s instead of %s" %
+                        [self.resource[:command], status.exitstatus, self.should.to_s])
+                end
+
                 return event
             end
         end
@@ -201,10 +207,11 @@ module Puppet
 
         newparam(:logoutput) do
             desc "Whether to log output.  Defaults to logging output at the
-                loglevel for the ``exec`` resource.  Values are **true**, *false*,
-                and any legal log level."
+                loglevel for the ``exec`` resource. Use *on_failure* to only
+                log the output when the command reports an error.  Values are
+                **true**, *false*, *on_failure*, and any legal log level."
 
-            values = [:true, :false]
+            values = [:true, :false, :on_failure]
             # And all of the log levels
             Puppet::Util::Log.eachlevel { |level| values << level }
             newvalues(*values)
@@ -276,8 +283,8 @@ module Puppet
                         refreshonly => true
                     }
                 
-                Note that only ``subscribe`` can trigger actions, not ``require``,
-                so it only makes sense to use ``refreshonly`` with ``subscribe``."
+                Note that only ``subscribe`` and ``notify`` can trigger actions, not ``require``,
+                so it only makes sense to use ``refreshonly`` with ``subscribe`` or ``notify``."
 
             newvalues(:true, :false)
 
@@ -602,4 +609,3 @@ module Puppet
     end
 end
 
-# $Id: exec.rb 2696 2007-07-14 20:26:31Z luke $

data/lib/puppet/type/group.rb

@@ -129,4 +129,3 @@ module Puppet
     end
 end
 
-# $Id: group.rb 2665 2007-07-09 21:32:33Z luke $

data/lib/puppet/type/host.rb

@@ -86,4 +86,3 @@ module Puppet
     end
 end
 
-# $Id: host.rb 2517 2007-05-15 19:22:36Z luke $

data/lib/puppet/type/interface.rb

@@ -43,15 +43,18 @@ Puppet::Type.newtype(:interface) do
               and alias. This is use to force a given number to be used"
 	end
 
+	newproperty(:netmask) do
+		desc "The netmask for the interface."
+	end
+
 	newproperty(:ifopts) do
 		desc "Interface options."
 	end
 
     newparam(:target) do
+        include Puppet::Util::Warnings
         desc "The path to the file this resource creates."
 
-        defaultto { @resource.provider.file_path }
+        munge { |value| warnonce "Interface targets are deprecated and no longer have any function" }
     end
 end
-
-# $Id: interface.rb 2747 2007-08-05 19:01:39Z luke $

data/lib/puppet/type/k5login.rb

@@ -0,0 +1,87 @@
+# $Id: k5login.rb 2468 2007-08-07 23:30:20Z digant $
+#
+# Plug-in type for handling k5login files
+
+Puppet::Type.newtype(:k5login) do
+    @doc = "Manage the .k5login file for a user.  Specify the full path to 
+        the .k5login file as the name and an array of principals as the
+        property principals."
+
+    ensurable
+
+    # Principals that should exist in the file
+    newproperty(:principals, :array_matching => :all) do
+        desc "The principals present in the .k5login file."
+    end
+
+    # The path/name of the k5login file
+    newparam(:path) do
+        isnamevar
+        desc "The path to the file to manage.  Must be fully qualified."
+
+        validate do |value|
+            unless value =~ /^#{File::SEPARATOR}/
+                raise Puppet::Error, "File paths must be fully qualified"
+            end
+        end
+    end
+
+    # To manage the mode of the file
+    newproperty(:mode) do
+        desc "Manage the k5login file's mode"
+        defaultto { "644" }
+    end
+
+    provide(:k5login) do
+        desc "The k5login provider is the only provider for the k5login 
+            type."
+
+        # Does this file exist?
+        def exists?
+            File.exists?(@resource[:name])
+        end
+
+        # create the file
+        def create
+            write(@resource.should(:principals))
+            should_mode = @resource.should(:mode)
+            unless self.mode == should_mode
+                self.mode  should_mode
+            end
+        end
+
+        # remove the file
+        def destroy
+            File.unlink(@resource[:name])
+        end
+
+        # Return the principals
+        def principals
+            if File.exists?(@resource[:name])
+                File.readlines(@resource[:name]).collect { |line| line.chomp }
+            else
+                :absent
+            end
+        end
+
+        # Write the principals out to the k5login file
+        def principals=(value)
+            write(value)
+        end
+
+        # Return the mode as an octal string, not as an integer
+        def mode
+            "%o" % (File.stat(@resource[:name]).mode & 007777)
+        end
+
+        # Set the file mode, converting from a string to an integer.
+        def mode=(value)
+            File.chmod(Integer("0" + value), @resource[:name])
+        end
+
+        private
+        def write(value)
+            File.open(@resource[:name], "w") { |f| f.puts value.join("\n") }
+        end
+    end
+end

data/lib/puppet/type/mailalias.rb

@@ -47,4 +47,3 @@ module Puppet
     end
 end
 
-# $Id: mailalias.rb 2676 2007-07-10 23:24:34Z luke $

data/lib/puppet/type/maillist.rb

@@ -54,4 +54,3 @@ module Puppet
     end
 end
 
-# $Id: maillist.rb 2677 2007-07-11 18:35:51Z luke $

data/lib/puppet/type/mount.rb

@@ -44,15 +44,12 @@ module Puppet
             newvalue(:mounted, :event => :mount_mounted) do
                 # Create the mount point if it does not already exist.
                 current_value = self.retrieve
-                if current_value.nil?  or current_value == :absent 
-                    provider.create
-                end
+                provider.create if current_value.nil? or current_value == :absent 
 
                 syncothers()
+
                 # The fs can be already mounted if it was absent but mounted
-                unless provider.mounted?
-                    provider.mount
-                end
+                provider.mount unless provider.mounted?
             end
 
             def retrieve
@@ -71,11 +68,11 @@ module Puppet
             def syncothers
                 # We have to flush any changes to disk.
                 currentvalues = @resource.retrieve
+
+                # Determine if there are any out-of-sync properties.
                 oos = @resource.send(:properties).find_all do |prop|
                     unless currentvalues.include?(prop)
-                        raise Puppet::DevError, 
-                          "Parent has property %s but it doesn't appear in the current vallues",
-                          [prop.name]
+                        raise Puppet::DevError, "Parent has property %s but it doesn't appear in the current values", [prop.name]
                     end
                     if prop.name == :ensure
                         false
@@ -198,9 +195,7 @@ module Puppet
 
         def refresh
             # Only remount if we're supposed to be mounted.
-            if ens = @parameters[:ensure] and ens.should == :mounted
-                provider.remount
-            end
+            provider.remount if self.should(:fstype) != "swap" and provider.mounted?
         end
 
         def value(name)
@@ -213,4 +208,3 @@ module Puppet
     end
 end
 
-# $Id: mount.rb 2723 2007-07-20 16:46:54Z luke $

data/lib/puppet/type/notify.rb

@@ -43,4 +43,3 @@ module Puppet
     end
 end
 
-# $Id: notify.rb 2525 2007-05-18 03:34:37Z luke $

data/lib/puppet/type/package.rb

@@ -4,7 +4,6 @@
 # systems.
 
 module Puppet
-    class PackageError < Puppet::Error; end
     newtype(:package) do
         @doc = "Manage packages.  There is a basic dichotomy in package
             support right now:  Some package types (e.g., yum and apt) can
@@ -108,25 +107,15 @@ module Puppet
                 @lateststamp ||= (Time.now.to_i - 1000)
                 # Iterate across all of the should values, and see how they
                 # turn out.
+
                 @should.each { |should|
                     case should
                     when :present
-                        unless [:absent, :purged].include?(is)
-                            return true
-                        end
+                        return true unless [:absent, :purged].include?(is)
                     when :latest
                         # Short-circuit packages that are not present
-                        if is == :absent
-                            return false
-                        end
-
-                        unless provider.respond_to?(:latest)
-                            self.fail(
-                                "Package type %s does not support specifying 'latest'" %
-                                @resource[:provider]
-                            )
-                        end
-
+                        return false if is == :absent or is == :purged
+ 
                         # Don't run 'latest' more than about every 5 minutes
                         if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5
                             #self.debug "Skipping latest check"
@@ -153,9 +142,9 @@ module Puppet
                                 [is.inspect, @resource.name, @latest.inspect]
                         end
                     when :absent
-                        if is == :absent or is == :purged
-                            return true
-                        end
+                        return true if is == :absent or is == :purged
+                    when :purged
+                        return true if is == :purged
                     when is
                         return true
                     end
@@ -312,46 +301,6 @@ module Puppet
             autos
         end
 
-        @listed = false
-
-        @allowedmethods = [:types]
-
-        class << self
-            attr_reader :listed
-        end
-
-        def self.clear
-            @listed = false
-            super
-        end
-
-        # Create a new package object from listed information
-        def self.installedpkg(hash)
-            unless hash.include? :provider
-                raise Puppet::DevError, "Got installed package with no provider"
-            end
-            # this is from code, so we don't have to do as much checking
-            name = hash[:name]
-            hash.delete(:name)
-
-            object = self[name] || self.create(:name => name)
-            object.setparams(hash)
-
-            return object
-        end
-
-        # Iterate across all packages of a given type and mark them absent
-        # if they are not in the list
-        def self.markabsent(pkgtype, packages)
-            # Mark any packages we didn't find as absent
-            self.each do |pkg|
-                next unless packages[:provider] == pkgtype
-                unless packages.include? pkg
-                    pkg.provider.send(:ensure, :absent)
-                end
-            end
-        end
-
         # This only exists for testing.
         def clear
             if obj = @parameters[:ensure]
@@ -365,10 +314,6 @@ module Puppet
             @provider.get(:ensure) != :absent
         end
 
-        # okay, there are two ways that a package could be created...
-        # either through the language, in which case the hash's values should
-        # be set in 'should', or through comparing against the system, in which
-        # case the hash's values should be set in 'is'
         def initialize(params)
             self.initvars
             provider = nil
@@ -403,4 +348,3 @@ module Puppet
     end # Puppet.type(:package)
 end
 
-# $Id: package.rb 2709 2007-07-19 00:14:15Z luke $

data/lib/puppet/type/pfile.rb

@@ -4,6 +4,7 @@ require 'etc'
 require 'uri'
 require 'fileutils'
 require 'puppet/network/handler'
+require 'puppet/util/diff'
 
 module Puppet
     newtype(:file) do
@@ -573,6 +574,8 @@ module Puppet
         # Create a new file or directory object as a child to the current
         # object.
         def newchild(path, local, hash = {})
+            raise(Puppet::DevError, "File recursion cannot happen without a catalog") unless catalog
+
             # make local copy of arguments
             args = symbolize_options(@arghash)
 
@@ -607,13 +610,12 @@ module Puppet
             }
 
             child = nil
-            klass = self.class
-            
+
             # The child might already exist because 'localrecurse' runs
             # before 'sourcerecurse'.  I could push the override stuff into
             # a separate method or something, but the work is the same other
             # than this last bit, so it doesn't really make sense.
-            if child = klass[path]
+            if child = catalog.resource(:file, path)
                 unless child.parent.object_id == self.object_id
                     self.debug "Not managing more explicit file %s" %
                         path
@@ -639,28 +641,20 @@ module Puppet
                 #notice "Creating new file with args %s" % args.inspect
                 args[:parent] = self
                 begin
-                    child = klass.implicitcreate(args)
-                    
-                    # implicit creation can return nil
-                    if child.nil?
-                        return nil
-                    end
-                rescue Puppet::Error => detail
-                    self.notice(
-                        "Cannot manage: %s" %
-                            [detail.message]
-                    )
-                    self.debug args.inspect
-                    child = nil
+                    # This method is used by subclasses of :file, so use the class name rather than hard-coding
+                    # :file.
+                    return nil unless child = catalog.create_implicit_resource(self.class.name, args)
                 rescue => detail
-                    self.notice(
-                        "Cannot manage: %s" %
-                            [detail]
-                    )
-                    self.debug args.inspect
-                    child = nil
+                    puts detail.backtrace
+                    self.notice "Cannot manage: %s" % [detail]
+                    return nil
                 end
             end
+
+            # LAK:FIXME This shouldn't be necessary, but as long as we're
+            # modeling the relationship graph specifically, it is.
+            catalog.relationship_graph.add_edge! self, child
+
             return child
         end
 
@@ -668,12 +662,14 @@ module Puppet
         # path names, rather than including the full parent's title each
         # time.
         def pathbuilder
-            if defined? @parent
+            # We specifically need to call the method here, so it looks
+            # up our parent in the catalog graph.
+            if parent = parent()
                 # We only need to behave specially when our parent is also
                 # a file
-                if @parent.is_a?(self.class)
+                if parent.is_a?(self.class)
                     # Remove the parent file name
-                    list = @parent.pathbuilder
+                    list = parent.pathbuilder
                     list.pop # remove the parent's path info
                     return list << self.ref
                 else
@@ -694,9 +690,7 @@ module Puppet
         # files.
         def recurse
             # are we at the end of the recursion?
-            unless self.recurse?
-                return
-            end
+            return unless self.recurse?
 
             recurse = self[:recurse]
             # we might have a string, rather than a number
@@ -893,8 +887,8 @@ module Puppet
                     # For directories, keep all of the sources, so that
                     # sourceselect still works as planned.
                     if type == "directory"
-                        newsource = @parameters[:source].should.collect do |source|
-                            source + file
+                        newsource = @parameters[:source].should.collect do |tmpsource|
+                            tmpsource + file
                         end
                     else
                         newsource = source + file
@@ -1047,7 +1041,7 @@ module Puppet
         # Write out the file.  We open the file correctly, with all of the
         # uid and mode and such, and then yield the file handle for actual
         # writing.
-        def write(usetmp = true)
+        def write(property, usetmp = true)
             mode = self.should(:mode)
 
             remove_existing(:file)
@@ -1178,4 +1172,3 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 2665 2007-07-09 21:32:33Z luke $