puppet 0.22.4 → 0.23.0

data/lib/puppet/provider/service/base.rb

@@ -11,16 +11,16 @@ Puppet::Type.type(:service).provide :base do
     # Get the process ID for a running process. Requires the 'pattern'
     # parameter.
     def getpid
-        unless @model[:pattern]
-            @model.fail "Either a stop command or a pattern must be specified"
+        unless @resource[:pattern]
+            @resource.fail "Either a stop command or a pattern must be specified"
         end
         ps = Facter["ps"].value
         unless ps and ps != ""
-            @model.fail(
+            @resource.fail(
                 "You must upgrade Facter to a version that includes 'ps'"
             )
         end
-        regex = Regexp.new(@model[:pattern])
+        regex = Regexp.new(@resource[:pattern])
         self.debug "Executing '#{ps}'"
         IO.popen(ps) { |table|
             table.each { |line|
@@ -36,7 +36,7 @@ Puppet::Type.type(:service).provide :base do
 
     # How to restart the process.
     def restart
-        if @model[:restart] or self.respond_to?(:restartcmd)
+        if @resource[:restart] or self.respond_to?(:restartcmd)
             ucommand(:restart)
         else
             self.stop
@@ -50,14 +50,12 @@ Puppet::Type.type(:service).provide :base do
     # happen if, for instance, it has an init script (and thus responds to
     # 'statuscmd') but does not have 'hasstatus' enabled.
     def status
-        if @model[:status] or (
+        if @resource[:status] or (
             self.respond_to?(:statuscmd) and self.statuscmd
         )
             # Don't fail when the exit status is not 0.
             output = ucommand(:status, false)
 
-            self.debug "%s status returned %s" %
-                [self.name, output.inspect]
             if $? == 0
                 return :running
             else
@@ -79,8 +77,8 @@ Puppet::Type.type(:service).provide :base do
     # The command used to start.  Generated if the 'binary' argument
     # is passed.
     def startcmd
-        if @model[:binary]
-            return @model[:binary]
+        if @resource[:binary]
+            return @resource[:binary]
         else
             raise Puppet::Error,
                 "Services must specify a start command or a binary"
@@ -93,7 +91,7 @@ Puppet::Type.type(:service).provide :base do
     # for the process in the process table.
     # This method will generally not be overridden by submodules.
     def stop
-        if @model[:stop] or self.respond_to?(:stopcmd)
+        if @resource[:stop] or self.respond_to?(:stopcmd)
             ucommand(:stop)
         else
             pid = getpid
@@ -104,7 +102,7 @@ Puppet::Type.type(:service).provide :base do
             begin
                 output = kill pid
             rescue Puppet::ExecutionFailure => detail
-                @model.fail "Could not kill %s, PID %s: %s" %
+                @resource.fail "Could not kill %s, PID %s: %s" %
                         [self.name, pid, output]
             end
             return true
@@ -117,14 +115,14 @@ Puppet::Type.type(:service).provide :base do
             # #565: Services generally produce no output, so squelch them.
             execute(command, :failonfail => fof, :squelch => true)
         rescue Puppet::ExecutionFailure => detail
-            @model.fail "Could not %s %s: %s" % [type, @model.ref, detail]
+            @resource.fail "Could not %s %s: %s" % [type, @resource.ref, detail]
         end
         return nil
     end
 
     # Use either a specified command or the default for our provider.
     def ucommand(type, fof = true)
-        if c = @model[type]
+        if c = @resource[type]
             cmd = [c]
         else
             cmd = self.send("%scmd" % type)
@@ -133,4 +131,4 @@ Puppet::Type.type(:service).provide :base do
     end
 end
 
-# $Id: base.rb 2385 2007-04-03 15:51:18Z mccune $
+# $Id: base.rb 2589 2007-06-15 15:37:03Z luke $

data/lib/puppet/provider/service/debian.rb

@@ -9,11 +9,11 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
     # Remove the symlinks
     def disable
-        update "-f", @model[:name], "remove"
+        update "-f", @resource[:name], "remove"
     end
 
     def enabled?
-        output = update "-n", "-f", @model[:name], "remove"
+        output = update "-n", "-f", @resource[:name], "remove"
 
         # If it's enabled, then it will print output showing removal of
         # links.
@@ -25,8 +25,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     end
 
     def enable
-        update @model[:name], "defaults"
+        update @resource[:name], "defaults"
     end
 end
 
-# $Id: debian.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: debian.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/service/gentoo.rb

@@ -10,7 +10,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     def disable
         begin
-            output = update :del, @model[:name], :default
+            output = update :del, @resource[:name], :default
         rescue Puppet::ExecutionFailure
             raise Puppet::Error, "Could not disable %s: %s" %
                 [self.name, output]
@@ -24,12 +24,12 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
             return :false
         end
 
-        line = output.split(/\n/).find { |l| l.include?(@model[:name]) }
+        line = output.split(/\n/).find { |l| l.include?(@resource[:name]) }
 
         return :false unless line
 
         # If it's enabled then it will print output showing service | runlevel
-        if output =~ /#{@model[:name]}\s*|\s*default/
+        if output =~ /#{@resource[:name]}\s*|\s*default/
             return :true
         else
             return :false
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     def enable
         begin
-            output = update :add, @model[:name], :default
+            output = update :add, @resource[:name], :default
         rescue Puppet::ExecutionFailure
             raise Puppet::Error, "Could not enable %s: %s" %
                 [self.name, output]

data/lib/puppet/provider/service/init.rb

@@ -29,7 +29,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 
     # List all services of this type.
-    def self.list(name)
+    def self.instances(name)
         # We need to find all paths specified for our type or any parent types
         paths = Puppet.type(:service).paths(name)
 
@@ -44,7 +44,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
             end
         end
 
-        paths.each do |path|
+        paths.collect do |path|
             unless FileTest.directory?(path)
                 Puppet.notice "Service path %s does not exist" % path
                 next
@@ -59,14 +59,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
             Dir.entries(path).reject { |e|
                 fullpath = File.join(path, e)
                 e =~ /^\./ or ! FileTest.executable?(fullpath)
-            }.each do |name|
-                if obj = Puppet::Type.type(:service)[name]
-                    obj[:check] = check
-                else
-                    Puppet::Type.type(:service).create(
-                        :name => name, :check => check, :path => path
-                    )
-                end
+            }.collect do |name|
+                new(:name => name, :path => path)
             end
         end
     end
@@ -87,12 +81,12 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         if defined? @initscript
             return @initscript
         else
-            @initscript = self.search(@model[:name])
+            @initscript = self.search(@resource[:name])
         end
     end
 
     def restart
-        if @model[:hasrestart] == :true
+        if @resource[:hasrestart] == :true
             command = [self.initscript, :restart]
             texecute("restart", command)
         else
@@ -101,7 +95,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 
     def search(name)
-        @model[:path].each { |path|
+        @resource[:path].each { |path|
             fqname = File.join(path,name)
             begin
                 stat = File.stat(fqname)
@@ -114,6 +108,19 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
             # if we've gotten this far, we found a valid script
             return fqname
         }
+        @model[:path].each { |path|
+            fqname_sh = File.join(path,"#{name}.sh")
+            begin
+                stat = File.stat(fqname_sh)
+            rescue
+                # should probably rescue specific errors...
+                self.debug("Could not find %s.sh in %s" % [name,path])
+                next
+            end
+
+            # if we've gotten this far, we found a valid script
+            return fqname_sh
+        }
         raise Puppet::Error, "Could not find init script for '%s'" % name
     end
 
@@ -126,7 +133,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # we just return that; otherwise, we return false, which causes it to
     # fallback to other mechanisms.
     def statuscmd
-        if @model[:hasstatus]
+        if @resource[:hasstatus]
             return [self.initscript, :status]
         else
             return false
@@ -139,4 +146,4 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 end
 
-# $Id: init.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: init.rb 2619 2007-06-18 21:26:04Z luke $

data/lib/puppet/provider/service/redhat.rb

@@ -19,8 +19,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     # Remove the symlinks
     def disable
         begin
-            output = chkconfig(@model[:name], :off)
-            output += chkconfig("--del", @model[:name])
+            output = chkconfig(@resource[:name], :off)
+            output += chkconfig("--del", @resource[:name])
         rescue Puppet::ExecutionFailure
             raise Puppet::Error, "Could not disable %s: %s" %
                 [self.name, output]
@@ -29,7 +29,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
 
     def enabled?
         begin
-            output = chkconfig(@model[:name])
+            output = chkconfig(@resource[:name])
         rescue Puppet::ExecutionFailure
             return :false
         end
@@ -47,8 +47,8 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     # in the init scripts.
     def enable
         begin
-            output = chkconfig("--add", @model[:name])
-            output += chkconfig(@model[:name], :on)
+            output = chkconfig("--add", @resource[:name])
+            output += chkconfig(@resource[:name], :on)
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error, "Could not enable %s: %s" %
                 [self.name, detail]
@@ -56,4 +56,4 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     end
 end
 
-# $Id: redhat.rb 2330 2007-03-19 22:13:09Z luke $
+# $Id: redhat.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/service/smf.rb

@@ -27,20 +27,20 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     end
 
     def restartcmd
-        [command(:adm), :restart, @model[:name]]
+        [command(:adm), :restart, @resource[:name]]
     end
 
     def startcmd
-        [command(:adm), :enable, @model[:name]]
+        [command(:adm), :enable, @resource[:name]]
     end
 
     def status
-        if @model[:status]
+        if @resource[:status]
             super
             return
         end
         begin
-            output = svcs "-l", @model[:name]
+            output = svcs "-l", @resource[:name]
         rescue Puppet::ExecutionFailure
             warning "Could not get status on service %s" % self.name
             return :stopped
@@ -78,8 +78,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     end
 
     def stopcmd
-        [command(:adm), :disable, @model[:name]]
+        [command(:adm), :disable, @resource[:name]]
     end
 end
 
-# $Id: smf.rb 2284 2007-03-17 02:50:48Z luke $
+# $Id: smf.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/user/netinfo.rb

@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
 
     autogen_defaults :home => "/var/empty", :shell => "/usr/bin/false", :password => '********'
 
-    has_features :manages_passwords
+    has_feature :manages_passwords
 
     verify :gid, "GID must be an integer" do |value|
         value.is_a? Integer
@@ -30,7 +30,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
     end
 
     def autogen_comment
-        return @model[:name].capitalize
+        return @resource[:name].capitalize
     end
 
     # The list of all groups the user is a member of.  Different
@@ -38,7 +38,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
     def groups
         groups = []
 
-        user = @model[:name]
+        user = @resource[:name]
         # Retrieve them all from netinfo
         open("| #{command(:nireport)} / /groups name users") do |file|
             file.each do |line|
@@ -84,7 +84,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
             end
         end
 
-        user = @model[:name]
+        user = @resource[:name]
         data.each do |name, members|
             if members.include? user and groups.include? name
                 # I'm in the group and should be
@@ -103,4 +103,4 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id: netinfo.rb 2415 2007-04-25 21:44:22Z luke $
+# $Id: netinfo.rb 2542 2007-05-30 20:36:29Z mpalmer $

data/lib/puppet/provider/user/pw.rb

@@ -4,6 +4,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     desc "User management via ``pw`` on FreeBSD."
 
     commands :pw => "pw"
+    has_features :manages_homedir, :allows_duplicates
 
     defaultfor :operatingsystem => :freebsd
 
@@ -20,22 +21,26 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     end
 
     def addcmd
-        cmd = [command(:pw), "useradd", @model[:name]]
-        @model.class.validproperties.each do |property|
+        cmd = [command(:pw), "useradd", @resource[:name]]
+        @resource.class.validproperties.each do |property|
             next if property == :ensure
             # the value needs to be quoted, mostly because -c might
             # have spaces in it
-            if value = @model.should(property) and value != ""
+            if value = @resource.should(property) and value != ""
                 cmd << flag(property) << value
             end
         end
 
-        if @model[:allowdupe] == :true
+        if @resource.allowdupe?
             cmd << "-o"
         end
 
+        if @resource.managehome?
+            cmd << "-m"
+        end
+
         return cmd
     end
 end
 
-# $Id: pw.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: pw.rb 2600 2007-06-18 06:42:07Z luke $

data/lib/puppet/provider/user/useradd.rb

@@ -19,44 +19,39 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     has_features :manages_homedir, :allows_duplicates
 
-    if Puppet.features.libshadow? and case Facter.value(:kernel)
-        when "Linux": true
-        else
-            false
-        end
-
-        has_features :manages_passwords
+    if Puppet.features.libshadow? and (Facter.value(:kernel) == "Linux")
+        has_feature :manages_passwords
     end
 
     def addcmd
         cmd = [command(:add)]
-        @model.class.validproperties.each do |property|
+        @resource.class.validproperties.each do |property|
             next if property == :ensure
             # the value needs to be quoted, mostly because -c might
             # have spaces in it
-            if value = @model.should(property) and value != ""
+            if value = @resource.should(property) and value != ""
                 cmd << flag(property) << value
             end
         end
 
-        if @model.allowdupe?
+        if @resource.allowdupe?
             cmd << "-o"
         end
 
-        if @model.managehome?
+        if @resource.managehome?
             cmd << "-m"
         elsif %w{Fedora RedHat}.include?(Facter.value("operatingsystem"))
             cmd << "-M"
         end
 
-        cmd << @model[:name]
+        cmd << @resource[:name]
 
         cmd
     end
 
     # Retrieve the password using the Shadow Password library
     def password
-        if ent = Shadow::Passwd.getspnam(@model.name)
+        if ent = Shadow::Passwd.getspnam(@resource.name)
             return ent.sp_pwdp
         else
             return :absent
@@ -64,4 +59,4 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id: useradd.rb 2414 2007-04-25 20:59:00Z luke $
+# $Id: useradd.rb 2542 2007-05-30 20:36:29Z mpalmer $