puppet 0.9.2 → 0.13.0

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

@@ -1,17 +1,12 @@
-module Puppet
-    module ServiceTypes
-        module BaseSvc
-
-            # The command used to start.  Generated if the 'binary' argument
-            # is passed.
-            def startcmd
-                if self[:binary]
-                    return self[:binary]
-                else
-                    raise Puppet::Error,
-                        "Services must specify a start command or a binary"
-                end
-            end
+Puppet.type(:service).newsvctype(:base) do
+    # The command used to start.  Generated if the 'binary' argument
+    # is passed.
+    def startcmd
+        if self[:binary]
+            return self[:binary]
+        else
+            raise Puppet::Error,
+                "Services must specify a start command or a binary"
         end
     end
 end

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

@@ -2,49 +2,43 @@ require 'puppet/type/service/init'
 
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
-module Puppet
-    module ServiceTypes
-        module DebianSvc
-            include Puppet::ServiceTypes::InitSvc
-            
-            # Remove the symlinks
-            def disable
-                output = %x{update-rc.d -f #{self.name} remove 2>/dev/null}
+Puppet.type(:service).newsvctype(:debian, :init) do
+    # Remove the symlinks
+    def disable
+        output = %x{update-rc.d -f #{self.name} remove 2>/dev/null}
 
-                unless $? == 0
-                    raise Puppet::Error, "Could not disable %s: %s" %
-                        [self.name, output]
-                end
-            end
+        unless $? == 0
+            raise Puppet::Error, "Could not disable %s: %s" %
+                [self.name, output]
+        end
+    end
 
-            def enabled?
-                output = %x{update-rc.d -n -f #{self.name} remove 2>/dev/null}
-                unless $? == 0
-                    raise Puppet::Error, "Could not check %s: %s" %
-                        [self.name, output]
-                end
+    def enabled?
+        output = %x{update-rc.d -n -f #{self.name} remove 2>/dev/null}
+        unless $? == 0
+            raise Puppet::Error, "Could not check %s: %s" %
+                [self.name, output]
+        end
 
-                # If it's enabled, then it will print output showing removal of
-                # links.
-                if output =~ /etc\/rc\d.d/
-                    return true
-                else
-                    return false
-                end
-            end
+        # If it's enabled, then it will print output showing removal of
+        # links.
+        if output =~ /etc\/rc\d.d/
+            return true
+        else
+            return false
+        end
+    end
 
-            def enable(runlevel)
-                if runlevel
-                    raise Puppet::Error, "Specification of runlevels is not supported"
-                else
-                    output = %x{update-rc.d #{self.name} defaults 2>/dev/null}
-                end
+    def enable(runlevel)
+        if runlevel
+            raise Puppet::Error, "Specification of runlevels is not supported"
+        else
+            output = %x{update-rc.d #{self.name} defaults 2>/dev/null}
+        end
 
-                unless $? == 0
-                    raise Puppet::Error, "Could not check %s: %s" %
-                        [self.name, output]
-                end
-            end
+        unless $? == 0
+            raise Puppet::Error, "Could not check %s: %s" %
+                [self.name, output]
         end
     end
 end

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

@@ -1,145 +1,145 @@
-module Puppet
-    module ServiceTypes
-        module InitSvc
-            # Make sure we've got a search path set up.  If they don't
-            # specify one, try to determine one.
-            def configchk
-                unless defined? @searchpaths
-                    @searchpaths = []
-                end
-                unless @searchpaths.length > 0
-                    if init = self.defaultinit
-                        self.notice "Adding default init"
-                        @searchpaths << init
-                    else
-                        self.notice "No default init for %s" %
-                            Facter["operatingsystem"].value
-
-                        raise Puppet::Error.new(
-                            "You must specify a valid search path for service %s" %
-                            self.name
-                        )
-                    end
-                end
-            end
-
-            # Get the default init path.
-            def defaultinit
-                unless defined? @defaultinit
-                    case Facter["operatingsystem"].value
-                    when "FreeBSD":
-                        @defaultinit = "/etc/rc.d"
-                    else
-                        @defaultinit = "/etc/init.d"
-                        @defaultrc = "/etc/rc%s.d"
-                    end
-                end
-
-                return @defaultinit
-            end
-
-            # Mark that our init script supports 'status' commands.
-            def hasstatus=(value)
-                case value
-                when true, "true": @parameters[:hasstatus] = true
-                when false, "false": @parameters[:hasstatus] = false
-                else
-                    raise Puppet::Error, "Invalid 'hasstatus' value %s" %
-                        value.inspect
-                end
-            end
-
-            # it'd be nice if i didn't throw the output away...
-            # this command returns true if the exit code is 0, and returns
-            # false otherwise
-            def initcmd(cmd)
-                script = self.initscript
+# The standard init-based service type.  Many other service types are
+# customizations of this module.
+Puppet.type(:service).newsvctype(:init) do
+
+    # Set the default init directory.
+    Puppet.type(:service).attrclass(:path).defaultto do
+        case Facter["operatingsystem"].value
+        when "FreeBSD":
+            "/etc/rc.d"
+        else
+            #@defaultrc = "/etc/rc%s.d"
+            "/etc/init.d"
+        end
+    end
+#    # Make sure we've got a search path set up.  If they don't
+#    # specify one, try to determine one.
+#    def configchk
+#        unless defined? @searchpaths
+#            Puppet.notice "Initting search paths"
+#            @searchpaths = []
+#        end
+#        unless @searchpaths.length > 0
+#            if init = self.defaultinit
+#                self.notice "Adding default init"
+#                @searchpaths << init
+#            else
+#                self.notice "No default init for %s" %
+#                    Facter["operatingsystem"].value
+#
+#                raise Puppet::Error.new(
+#                    "You must specify a valid search path for service %s" %
+#                    self.name
+#                )
+#            end
+#        end
+#    end
+#
+#    # Get the default init path.
+#    def defaultinit
+#        unless defined? @defaultinit
+#            case Facter["operatingsystem"].value
+#            when "FreeBSD":
+#                @defaultinit = "/etc/rc.d"
+#            else
+#                @defaultinit = "/etc/init.d"
+#                @defaultrc = "/etc/rc%s.d"
+#            end
+#        end
+#
+#        return @defaultinit
+#    end
+
+    # Mark that our init script supports 'status' commands.
+    def hasstatus=(value)
+        case value
+        when true, "true": @parameters[:hasstatus] = true
+        when false, "false": @parameters[:hasstatus] = false
+        else
+            raise Puppet::Error, "Invalid 'hasstatus' value %s" %
+                value.inspect
+        end
+    end
 
-                self.debug "Executing '%s %s' as initcmd for '%s'" %
-                    [script,cmd,self]
+    # it'd be nice if i didn't throw the output away...
+    # this command returns true if the exit code is 0, and returns
+    # false otherwise
+    def initcmd(cmd)
+        script = self.initscript
 
-                rvalue = Kernel.system("%s %s" %
-                        [script,cmd])
+        self.debug "Executing '%s %s' as initcmd for '%s'" %
+            [script,cmd,self]
 
-                self.debug "'%s' ran with exit status '%s'" %
-                    [cmd,rvalue]
+        rvalue = Kernel.system("%s %s" %
+                [script,cmd])
 
+        self.debug "'%s' ran with exit status '%s'" %
+            [cmd,rvalue]
 
-                rvalue
-            end
 
-            # Where is our init script?
-            def initscript
-                if defined? @initscript
-                    return @initscript
-                else
-                    @initscript = self.search(self.name)
-                end
-            end
+        rvalue
+    end
 
-            # Store the search path for init scripts.  This will generally not
-            # be called.
-            def parampath=(ary)
-                unless ary.is_a?(Array)
-                    ary = [ary]
-                end
-                @parameters[:path] = ary
-                @searchpaths = ary.find_all { |dir|
-                    File.directory?(dir)
-                }
-            end
+    # Where is our init script?
+    def initscript
+        if defined? @initscript
+            return @initscript
+        else
+            @initscript = self.search(self.name)
+        end
+    end
 
-            # Enable a service, so it's started at boot time.  This basically
-            # just creates links in the RC directories, which means that, well,
-            # we need to know where the rc directories are.
-            # FIXME This should probably be a state or something, and
-            # it should actually create use Symlink objects...
-            # At this point, people should just link objects for enabling,
-            # if they're running on a system that doesn't have a tool to
-            # manage init script links.
-            #def enable
-            #end
-
-            #def disable
-            #end
-
-            def search(name)
-                @searchpaths.each { |path|
-                    fqname = File.join(path,name)
-                    begin
-                        stat = File.stat(fqname)
-                    rescue
-                        # should probably rescue specific errors...
-                        self.debug("Could not find %s in %s" % [name,path])
-                        next
-                    end
-
-                    # if we've gotten this far, we found a valid script
-                    return fqname
-                }
-                raise Puppet::Error, "Could not find init script for '%s'" % name
+    # Enable a service, so it's started at boot time.  This basically
+    # just creates links in the RC directories, which means that, well,
+    # we need to know where the rc directories are.
+    # FIXME This should probably be a state or something, and
+    # it should actually create use Symlink objects...
+    # At this point, people should just link objects for enabling,
+    # if they're running on a system that doesn't have a tool to
+    # manage init script links.
+    #def enable
+    #end
+
+    #def disable
+    #end
+
+    def search(name)
+        self[:path].each { |path|
+            fqname = File.join(path,name)
+            begin
+                stat = File.stat(fqname)
+            rescue
+                # should probably rescue specific errors...
+                self.debug("Could not find %s in %s" % [name,path])
+                next
             end
 
-            # The start command is just the init scriptwith 'start'.
-            def startcmd
-                self.initscript + " start"
-            end
+            # if we've gotten this far, we found a valid script
+            return fqname
+        }
+        raise Puppet::Error, "Could not find init script for '%s'" % name
+    end
 
-            # If it was specified that the init script has a 'status' command, then
-            # we just return that; otherwise, we return false, which causes it to
-            # fallback to other mechanisms.
-            def statuscmd
-                if self[:hasstatus]
-                    return self.initscript + " status"
-                else
-                    return false
-                end
-            end
+    # The start command is just the init scriptwith 'start'.
+    def startcmd
+        self.initscript + " start"
+    end
 
-            # The stop command is just the init script with 'stop'.
-            def stopcmd
-                self.initscript + " stop"
-            end
+    # If it was specified that the init script has a 'status' command, then
+    # we just return that; otherwise, we return false, which causes it to
+    # fallback to other mechanisms.
+    def statuscmd
+        if self[:hasstatus]
+            return self.initscript + " status"
+        else
+            return false
         end
     end
+
+    # The stop command is just the init script with 'stop'.
+    def stopcmd
+        self.initscript + " stop"
+    end
 end
+
+# $Id: init.rb 796 2006-01-10 14:38:39Z luke $

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

@@ -1,29 +1,57 @@
-module Puppet
-    module ServiceTypes
-        module SMFSvc
-            def restartcmd
-            end
+# Solaris 10 SMF-style services.  This is not yet implemented, which is probably
+# somewhat obvious.
+Puppet.type(:service).newsvctype(:smf) do
+    def restartcmd
+        "svcadm restart %s" % self.name
+    end
 
-            # The start command is just the init scriptwith 'start'.
-            def startcmd
-                self.initscript + " start"
-            end
+    def startcmd
+        "svcadm enable %s" % self.name
+    end
 
-            # If it was specified that the init script has a 'status' command, then
-            # we just return that; otherwise, we return false, which causes it to
-            # fallback to other mechanisms.
-            def statuscmd
-                if self[:hasstatus]
-                    return self.initscript + " status"
+    def status
+        if self[:status]
+            super
+            return
+        end
+        %x{/usr/bin/svcs -l #{self.name} 2>/dev/null}.split("\n").each { |line|
+            var = nil
+            value = nil
+            if line =~ /^(\w+)\s+(.+)/
+                var = $1
+                value = $2
+            else
+                Puppet.err "Could not match %s" % line.inspect
+            end
+            case var
+            when "state":
+                case value
+                when "online":
+                    #self.warning "matched running %s" % line.inspect
+                    return :running
+                when "offline", "disabled":
+                    #self.warning "matched stopped %s" % line.inspect
+                    return :stopped
+                when "legacy_run":
+                    raise Puppet::Error,
+                        "Cannot manage legacy services through SMF"
                 else
-                    return false
+                    raise Puppet::Error,
+                        "Unmanageable state %s on service %s" %
+                        [value, self.name]
                 end
             end
+        }
 
-            # The stop command is just the init script with 'stop'.
-            def stopcmd
-                self.initscript + " stop"
-            end
+        if $? != 0
+            raise Puppet::Error,
+                "Could not get status on service %s" % self.name
         end
     end
+
+    def stopcmd
+        "svcadm disable %s" % self.name
+    end
 end
+
+# $Id: smf.rb 809 2006-01-12 07:08:19Z luke $