puppet 0.13.6 → 0.16.0

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

@@ -5,7 +5,9 @@ require 'puppet/type/service/init'
 Puppet.type(:service).newsvctype(:debian, :init) do
     # Remove the symlinks
     def disable
-        output = %x{update-rc.d -f #{self[:name]} remove 2>&1}
+        cmd = %{update-rc.d -f #{self[:name]} remove 2>&1}
+        self.debug "Executing '%s'" % cmd
+        output = %x{#{cmd}}
 
         unless $? == 0
             raise Puppet::Error, "Could not disable %s: %s" %
@@ -14,7 +16,9 @@ Puppet.type(:service).newsvctype(:debian, :init) do
     end
 
     def enabled?
-        output = %x{update-rc.d -n -f #{self[:name]} remove 2>&1}
+        cmd = %{update-rc.d -n -f #{self[:name]} remove 2>&1}
+        self.debug "Executing 'enabled' test: '%s'" % cmd
+        output = %x{#{cmd}}
         unless $? == 0
             raise Puppet::Error, "Could not check %s: %s" %
                 [self.name, output]
@@ -30,7 +34,9 @@ Puppet.type(:service).newsvctype(:debian, :init) do
     end
 
     def enable
-        output = %x{update-rc.d #{self[:name]} defaults 2>&1}
+        cmd = %{update-rc.d #{self[:name]} defaults 2>&1}
+        self.debug "Executing '%s'" % cmd
+        output = %x{#{cmd}}
 
         unless $? == 0
             raise Puppet::Error, "Could not enable %s: %s" %

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

@@ -1,54 +1,63 @@
 # 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
+    def self.defpath
         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
+
+    Puppet.type(:service).newpath(:init, defpath())
+
+    # Set the default init directory.
+    Puppet.type(:service).attrclass(:path).defaultto defpath()
+
+    # List all services of this type.  This has to be an instance method
+    # so that it's inherited by submodules.
+    def list(name)
+        # We need to find all paths specified for our type or any parent types
+        paths = Puppet.type(:service).paths(name)
+
+        # Now see if there are any included modules
+        included_modules.each do |mod|
+            next unless mod.respond_to? :name
+
+            mname = mod.name
+
+            if mpaths = Puppet.type(:service).paths(mname) and ! mpaths.empty?
+                 paths += mpaths
+            end
+        end
+
+        paths.each do |path|
+            unless FileTest.directory?(path)
+                Puppet.notice "Service path %s does not exist" % path
+                next
+            end
+
+            check = [:ensure]
+
+            if public_method_defined? :enabled?
+                check << :enable
+            end
+
+            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
+            end
+        end
+    end
 
     # Mark that our init script supports 'status' commands.
     def hasstatus=(value)
@@ -89,20 +98,6 @@ Puppet.type(:service).newsvctype(:init) do
         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)
         self[:path].each { |path|
             fqname = File.join(path,name)
@@ -142,4 +137,4 @@ Puppet.type(:service).newsvctype(:init) do
     end
 end
 
-# $Id: init.rb 922 2006-02-16 19:10:34Z luke $
+# $Id: init.rb 1125 2006-04-20 19:38:48Z luke $

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

@@ -1,11 +1,20 @@
 # Solaris 10 SMF-style services.
 Puppet.type(:service).newsvctype(:smf) do
     def enable
-        "svcadm enable %s" % self[:name]
+        self.start
     end
 
-    def dsiable
-        "svcadm disable %s" % self[:name]
+    def enabled?
+        case self.status
+        when :running:
+            return :true
+        else
+            return :false
+        end
+    end
+
+    def disable
+        self.stop
     end
 
     def restartcmd
@@ -51,8 +60,9 @@ Puppet.type(:service).newsvctype(:smf) do
         }
 
         if $? != 0
-            raise Puppet::Error,
-                "Could not get status on service %s" % self.name
+            #raise Puppet::Error,
+            warning "Could not get status on service %s" % self.name
+            return :stopped
         end
     end
 
@@ -61,4 +71,4 @@ Puppet.type(:service).newsvctype(:smf) do
     end
 end
 
-# $Id: smf.rb 938 2006-02-24 20:01:01Z luke $
+# $Id: smf.rb 1113 2006-04-17 16:15:33Z luke $

data/lib/puppet/type/state.rb

@@ -19,25 +19,49 @@ class State < Puppet::Parameter
         attr_accessor :unmanaged
         attr_reader :name
 
-        #def inspect
-        #    "State(%s)" % self.name
-        #end
+        def checkable
+            @checkable = true
+        end
+
+        def uncheckable
+            @checkable = false
+        end
+
+        def checkable?
+            if defined? @checkable
+                return @checkable
+            else
+                return true
+            end
+        end
+    end
 
-        #def to_s
-        #    self.inspect
-        #end
+    # Create the value management variables.
+    def self.initvars
+        @parametervalues = {}
+        @aliasvalues = {}
+        @parameterregexes = {}
     end
 
-    # Parameters just use 'newvalues', since there's no work associated with them.
+    # Parameters just use 'newvalues', since there's no work associated with them,
+    # but states have blocks associated with their allowed values.
     def self.newvalue(name, &block)
-        @parametervalues ||= {}
+        name = name.intern if name.is_a? String
 
-        if @parametervalues.include?(name)
-            Puppet.warning "%s already has a value for %s" % [name, name]
-        end
-        @parametervalues[name] = block
+        case name
+        when Symbol
+            if @parametervalues.include?(name)
+                Puppet.warning "%s reassigning value %s" % [self.name, name]
+            end
+            @parametervalues[name] = block
 
-        define_method("set_" + name.to_s, &block)
+            define_method("set_" + name.to_s, &block)
+        when Regexp
+            @parameterregexes[name] = block
+        else
+            raise ArgumentError, "Invalid value %s of type %s" %
+                [name, name.class]
+        end
     end
 
     # Call the method associated with a given value.
@@ -49,32 +73,43 @@ class State < Puppet::Parameter
 
         value = self.should
         method = "set_" + value.to_s
-        unless self.respond_to?(method)
-            self.fail "%s is not a valid value for %s" %
-                [value, self.class.name]
-        end
-        self.debug "setting %s (currently %s)" % [value, self.is]
+        event = nil
+        if self.respond_to?(method)
+            self.debug "setting %s (currently %s)" % [value, self.is]
 
-        begin
-            event = self.send(method)
-        rescue Puppet::Error
-            raise
-        rescue => detail
-            if Puppet[:debug]
-                puts detail.backtrace
+            begin
+                event = self.send(method)
+            rescue Puppet::Error
+                raise
+            rescue => detail
+                if Puppet[:debug]
+                    puts detail.backtrace
+                end
+                self.fail "Could not set %s on %s: %s" %
+                    [value, self.class.name, detail]
             end
-            self.fail "Could not set %s on %s: %s" %
-                [value, self.class.name, detail]
+        elsif ary = self.class.match?(value)
+            # FIXME It'd be better here to define a method, so that
+            # the blocks could return values.
+            event = self.instance_eval(&ary[1])
+        else
+            self.fail "%s is not a valid value for %s" %
+                [value, self.class.name]
         end
 
         if event and event.is_a?(Symbol)
-            return event
+            if event == :nochange
+                return nil
+            else
+                return event
+            end
         else
             # Return the appropriate event.
             event = case self.should
             when :present: (@parent.class.name.to_s + "_created").intern
             when :absent: (@parent.class.name.to_s + "_removed").intern
             else
+                warning self.should.inspect
                 (@parent.class.name.to_s + "_changed").intern
             end
 
@@ -106,8 +141,8 @@ class State < Puppet::Parameter
 
     def inspect
         str = "State('%s', " % self.name
-        if defined? @is and @is
-            str += "@is = '%s', " % @is
+        if self.is
+            str += "@is = '%s', " % [self.is]
         else
             str += "@is = nil, "
         end
@@ -186,7 +221,11 @@ class State < Puppet::Parameter
     # return the full path to us, for logging and rollback; not currently
     # used
     def path
-        return [@parent.path, self.name].join("/")
+        if defined? @parent and @parent
+            return [@parent.path, self.name].join("/")
+        else
+            return self.name
+        end
     end
 
     # Only return the first value
@@ -352,4 +391,4 @@ class State < Puppet::Parameter
 end
 end
 
-# $Id: state.rb 912 2006-02-15 18:23:33Z luke $
+# $Id: state.rb 1124 2006-04-20 07:00:10Z luke $

data/lib/puppet/type/symlink.rb

@@ -4,7 +4,8 @@ require 'puppet/type/pfile'
 
 module Puppet
     newtype(:symlink) do
-        @doc = "Create symbolic links to existing files."
+        @doc = "Create symbolic links to existing files.  **This type is deprecated;
+            use file_ instead.**"
         #newstate(:ensure) do
         ensurable do
             require 'etc'
@@ -65,7 +66,7 @@ module Puppet
             end
 
             # this is somewhat complicated, because it could exist and be
-            # a file
+            # a link
             def sync
                 case self.should
                 when :absent
@@ -109,7 +110,7 @@ module Puppet
                     # in /opt/csw; link it into /usr/local
                     symlink { \"/usr/local\":
                         ensure => \"/opt/csw\",
-                        recurse => 1
+                        recurse => true
                     }
 
 
@@ -120,13 +121,16 @@ module Puppet
                 @stat = nil
                 @target = @parent.state(:ensure).should
 
+                self.setparent(@target)
+            end
+
+            def setparent(value)
                 # we want to remove our state, because we're creating children
                 # to do the links
                 if FileTest.exist?(@target)
-                    @stat = File.stat(@target)
+                    @stat = File.lstat(@target)
                 else
-                    @parent.info "Target %s must exist for recursive links" %
-                        @target
+                    @setparent = false
                     return
                 end
 
@@ -168,6 +172,7 @@ module Puppet
                 dir = Puppet.type(:file).implicitcreate(args)
                 dir.parent = @parent
                 @parent.push dir
+                @setparent = true
             end
         end
 
@@ -179,4 +184,4 @@ module Puppet
     end # Puppet.type(:symlink)
 end
 
-# $Id: symlink.rb 922 2006-02-16 19:10:34Z luke $
+# $Id: symlink.rb 1098 2006-04-10 22:13:10Z luke $

data/lib/puppet/type/tidy.rb

@@ -157,6 +157,10 @@ module Puppet
         validate do
         end
 
+        def self.list
+            self.collect { |t| t }
+        end
+
         @depthfirst = true
 
         def initialize(hash)
@@ -183,4 +187,4 @@ module Puppet
     end
 end
 
-# $Id: tidy.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: tidy.rb 1125 2006-04-20 19:38:48Z luke $

data/lib/puppet/type/user.rb

@@ -19,6 +19,27 @@ module Puppet
 
         newstate(:ensure, @parentstate) do
             newvalue(:present) do
+                # Verify that they have provided everything necessary, if we
+                # are trying to manage the user
+                if @parent.managed?
+                    @parent.class.states.each { |state|
+                        next if stateobj = @parent.state(state.name)
+                        next if state.name == :ensure
+
+                        unless state.autogen? or state.isoptional?
+                            if state.method_defined?(:autogen)
+                                @parent[state.name] = :auto
+                            else
+                                @parent.fail "Users require a value for %s" %
+                                    state.name
+                            end
+                        end
+                    }
+
+                    #if @states.empty?
+                    #    @parent[:comment] = @parent[:name]
+                    #end
+                end
                 self.syncname(:present)
             end
 
@@ -198,6 +219,76 @@ module Puppet
             isautogen
         end
 
+        newstate(:groups, @parentstate) do
+            desc "The groups of which the user is a member.  The primary
+                group should not be listed.  Multiple groups should be
+                specified as an array."
+
+            isoptional
+
+            def should_to_s
+                self.should
+            end
+
+            def is_to_s
+                @is.join(",")
+            end
+
+            # We need to override this because the groups need to
+            # be joined with commas
+            def should
+                unless defined? @is
+                    retrieve
+                end
+
+                @should ||= []
+
+                if @parent[:membership] == :inclusive
+                    @should.sort.join(",")
+                else
+                    (@is + @should).uniq.sort.join(",")
+                end
+            end
+
+            def retrieve
+                @is = grouplist()
+            end
+
+            def insync?
+                unless defined? @should and @should
+                    return false
+                end
+                unless defined? @is and @is
+                    return false
+                end
+                return @is.sort == @should.sort
+            end
+
+            validate do |value|
+                if value =~ /^\d+$/
+                    raise ArgumentError, "Group names must be provided, not numbers"
+                end
+            end
+
+            def sync
+                if respond_to? :setgrouplist
+                    groups = nil
+                    if @parent[:membership] == :inclusive
+                        groups = @should
+                    else
+                        groups = (@is + @should).uniq
+                    end
+
+                    # Pass them the group list, so that the :membership logic
+                    # is all in this class, not in parent classes.
+                    setgrouplist(groups)
+                    return :user_modified
+                else
+                    super
+                end
+            end
+        end
+
         # these three states are all implemented differently on each platform,
         # so i'm disabling them for now
 
@@ -230,6 +321,16 @@ module Puppet
             isnamevar
         end
 
+        newparam(:membership) do
+            desc "Whether specified groups should be treated as the only groups
+                of which the user is a member or whether they should merely
+                be treated as the minimum membership list."
+                
+            newvalues(:inclusive, :minimum)
+
+            defaultto :minimum
+        end
+
         @doc = "Manage users.  Currently can create and modify users, but
             cannot delete them.  Theoretically all of the parameters are
             optional, but if no parameters are specified the comment will
@@ -287,6 +388,18 @@ module Puppet
             end
         end
 
+        # List all found users
+        def self.listbyname
+            users = []
+            Etc.setpwent
+            while ent = Etc.getpwent
+                users << ent.name
+            end
+            Etc.endpwent
+
+            return users
+        end
+
         def exists?
             self.class.parentmodule.exists?(self)
         end
@@ -307,25 +420,8 @@ module Puppet
             @userinfo = nil
             super
 
-            # Verify that they have provided everything necessary, if we
-            # are trying to manage the user
-            if self.managed?
-                self.class.states.each { |state|
-                    next if @states.include?(state.name)
-                    next if state.name == :ensure
-
-                    unless state.autogen? or state.isoptional?
-                        if state.method_defined?(:autogen)
-                            self[state.name] = :auto
-                        else
-                            self.fail "Users require a value for %s" % state.name
-                        end
-                    end
-                }
-
-                if @states.empty?
-                    self[:comment] = self[:name]
-                end
+            unless defined? @states
+                raise "wtf?"
             end
         end
 
@@ -345,4 +441,4 @@ module Puppet
     end
 end
 
-# $Id: user.rb 966 2006-03-02 17:12:26Z luke $
+# $Id: user.rb 1125 2006-04-20 19:38:48Z luke $