puppet 0.24.4 → 0.24.5

data/lib/puppet/provider/package/ports.rb

@@ -72,8 +72,13 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
     end
 
     def query
+        # support portorigin_glob such as "mail/postfix"
+        name = self.name
+        if name =~ /\//
+            name = self.name.split(/\//).slice(1)
+        end
         self.class.instances.each do |instance|
-            if instance.name == self.name
+            if instance.name == name
                 return instance.properties
             end
         end

data/lib/puppet/provider/package/rpm.rb

@@ -43,19 +43,20 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     # a hash with entries :instance => fully versioned package name, and 
     # :ensure => version-release
     def query
-        unless @property_hash[:epoch]
-            cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
-
-            begin
-                output = rpm(*cmd)
-            rescue Puppet::ExecutionFailure
-                return nil
-            end
-            
-            # FIXME: We could actually be getting back multiple packages
-            # for multilib
-            @property_hash.update(self.class.nevra_to_hash(output))
+        #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
+        #IF YOU CALL THIS METHOD, IT WILL CALL RPM
+        #Use get(:property) to check if cached values are available 
+        cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"]
+
+        begin
+            output = rpm(*cmd)
+        rescue Puppet::ExecutionFailure
+            return nil
         end
+        
+        # FIXME: We could actually be getting back multiple packages
+        # for multilib
+        @property_hash.update(self.class.nevra_to_hash(output))
 
         return @property_hash.dup
     end
@@ -67,7 +68,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         end
         
         cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"]
-        h = nevra_to_hash(execfail(cmd, Puppet::Error))
+        h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error))
         return h[:ensure]
     end
 

data/lib/puppet/provider/package/urpmi.rb

@@ -1,6 +1,6 @@
 Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     desc "Support via ``urpmi``."
-    commands :urpmi => "urpmi", :rpm => "rpm"
+    commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm"
 
     if command('rpm')
         confine :true => begin
@@ -41,9 +41,9 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
 
     # What's the latest package version available?
     def latest
-        output = urpmi "-S",  :available, @resource[:name]
+        output = urpmq "-S", @resource[:name]
 
-        if output =~ /^#{@resource[:name]}\S+\s+(\S+)\s/
+        if output =~ /^#{@resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
             return $1
         else
             # urpmi didn't find updates, pretend the current

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

@@ -1,10 +1,10 @@
 Puppet::Type.type(:service).provide :base do
     desc "The simplest form of service support.  You have to specify
         enough about your service for this to work; the minimum you can specify
-        is a binary for starting the process, and this same binary will be searched
-        for in the process table to stop the service.  It is preferable to
-        specify start, stop, and status commands, akin to how you would do
-        so using ``init``."
+        is a binary for starting the process, and this same binary will be 
+        searched for in the process table to stop the service.  It is 
+        preferable to specify start, stop, and status commands, akin to how you
+        would do so using ``init``."
 
     commands :kill => "kill"
 

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

@@ -22,7 +22,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
         # If it's enabled, then it will print output showing removal of
         # links.
-        if output =~ /etc\/rc[\dS].d|not installed/
+        if output =~ /etc\/rc[\dS].d\/S|not installed/
             return :true
         else
             return :false

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

@@ -2,9 +2,9 @@
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
     desc "Standard init service management.  This provider assumes that the
-        init script has not ``status`` command, because so few scripts do,
-        so you need to either provide a status command or specify via ``hasstatus``
-        that one already exists in the init script."
+        init script has no ``status`` command, because so few scripts do,
+        so you need to either provide a status command or specify via 
+        ``hasstatus`` that one already exists in the init script."
 
     class << self
         attr_accessor :defpath
@@ -13,6 +13,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     case Facter["operatingsystem"].value
     when "FreeBSD":
         @defpath = ["/etc/rc.d", "/usr/local/etc/rc.d"]
+    when "HP-UX":
+        @defpath = "/sbin/init.d"
     else
         @defpath = "/etc/init.d"
     end

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

@@ -1,11 +1,11 @@
-# Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
-# is special.
+# Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
+
 Puppet::Type.type(:service).provide :redhat, :parent => :init do
     desc "Red Hat's (and probably many others) form of ``init``-style service
         management; uses ``chkconfig`` for service enabling and disabling."
 
-    commands :chkconfig => "/sbin/chkconfig"
-
+    commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
+ 
     defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos]
 
     def self.defpath
@@ -16,7 +16,6 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     def disable
         begin
             output = chkconfig(@resource[:name], :off)
-            output += chkconfig("--del", @resource[:name])
         rescue Puppet::ExecutionFailure
             raise Puppet::Error, "Could not disable %s: %s" %
                 [self.name, output]
@@ -43,12 +42,41 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     # in the init scripts.
     def enable
         begin
-            output = chkconfig("--add", @resource[:name])
-            output += chkconfig(@resource[:name], :on)
+            output = chkconfig(@resource[:name], :on)
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error, "Could not enable %s: %s" %
                 [self.name, detail]
         end
     end
+ 
+    def restart
+        if @resource[:hasrestart] == :true
+              service(@resource[:name], "restart")
+        else
+           super
+        end
+    end
+
+    def status
+        if @resource[:hasstatus] == :true
+              begin 
+                  service(@resource[:name], "status")
+                  return :running
+              rescue 
+                  return :stopped
+              end 
+        else
+           super
+        end
+    end
+
+    def start
+        service(@resource[:name], "start")
+    end
+
+    def stop
+        service(@resource[:name], "stop")
+    end
+
 end
 

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -0,0 +1,69 @@
+require 'puppet/provider/parsedfile'
+
+Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
+    :parent => Puppet::Provider::ParsedFile,
+    :filetype => :flat,
+    :default_target => ''
+) do
+    desc "Parse and generate authorized_keys files for SSH."
+
+    text_line :comment, :match => /^#/
+    text_line :blank, :match => /^\s+/
+
+    record_line :parsed,
+        :fields   => %w{options type key name},
+        :optional => %w{options},
+        :rts => /^\s+/,
+        :match    => /^(?:([^ ]+) )?(ssh-dss|ssh-rsa) ([^ ]+)(?: (.+))?$/,
+        :post_parse => proc { |record|
+            if record[:options].nil?
+                record[:options] = [:absent]
+            else
+                record[:options] = record[:options].split(',')
+            end
+        },
+        :pre_gen => proc { |record|
+            if record[:options].include?(:absent)
+                record[:options] = ""
+            else
+                record[:options] = record[:options].join(',')
+            end
+        }
+
+    def prefetch
+        # This was done in the type class but path expansion was failing for
+        # not yet existing users, the only workaround I found was to move that
+        # in the provider.
+        if user = @resource.should(:user)
+            target = File.expand_path("~%s/.ssh/authorized_keys" % user)
+            @property_hash[:target] = target
+            @resource[:target] = target
+        end
+
+        super
+    end
+
+    def flush
+        # As path expansion had to be moved in the provider, we cannot generate new file
+        # resources and thus have to chown and chmod here. It smells hackish.
+        
+        # Create target's parent directory if nonexistant
+        if target = @property_hash[:target]
+            dir = File.dirname(@property_hash[:target])
+            if not File.exist? dir
+                Puppet.debug("Creating directory %s which did not exist" % dir)
+                Dir.mkdir(dir, 0700)
+            end
+        end
+
+        # Generate the file
+        super
+
+        # Ensure correct permissions
+        if target and user = @property_hash[:user]
+            File.chown(Puppet::Util.uid(user), nil, dir)
+            File.chown(Puppet::Util.uid(user), nil, @property_hash[:target])
+        end
+    end
+end
+

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

@@ -0,0 +1,133 @@
+require 'puppet/provider/ldap'
+
+Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
+    desc "User management via ``ldap``.  This provider requires that you
+        have valid values for all of the ldap-related settings,
+        including ``ldapbase``.  You will also almost definitely need settings
+        for ``ldapuser`` and ``ldappassword``, so that your clients can write
+        to ldap.
+        
+        Note that this provider will automatically generate a UID for you if
+        you do not specify one, but it is a potentially expensive operation,
+        as it iterates across all existing users to pick the appropriate next
+        one."
+
+    confine :feature => :ldap, :false => (Puppet[:ldapuser] == "")
+
+    has_feature :manages_passwords
+
+    manages(:posixAccount, :person).at("ou=People").named_by(:uid).and.maps :name => :uid,
+        :password => :userPassword,
+        :comment => :cn,
+        :uid => :uidNumber,
+        :gid => :gidNumber,
+        :home => :homeDirectory,
+        :shell => :loginShell
+
+    # Use the last field of a space-separated array as
+    # the sn.  LDAP requires a surname, for some stupid reason.
+    manager.generates(:sn).from(:cn).with do |cn|
+        x = 1
+        cn[0].split(/\s+/)[-1]
+    end
+
+    # Find the next uid after the current largest uid.
+    provider = self
+    manager.generates(:uidNumber).with do 
+        largest = 500
+        if existing = provider.manager.search
+            existing.each do |hash|
+                next unless value = hash[:uid]
+                num = value[0].to_i
+                if num > largest
+                    largest = num
+                end
+            end
+        end
+        largest + 1
+    end
+
+    # Convert our gid to a group name, if necessary.
+    def gid=(value)
+        unless [Fixnum, Bignum].include?(value.class)
+            value = group2id(value)
+        end
+
+        @property_hash[:gid] = value
+    end
+
+    # Find all groups this user is a member of in ldap.
+    def groups
+        # We want to cache the current result, so we know if we
+        # have to remove old values.
+        unless @property_hash[:groups]
+            unless result = group_manager.search("memberUid=%s" % name)
+                return @property_hash[:groups] = :absent
+            end
+
+            return @property_hash[:groups] = result.collect { |r| r[:name] }.join(",")
+        end
+        return @property_hash[:groups]
+    end
+
+    # Manage the list of groups this user is a member of.
+    def groups=(values)
+        should = values.split(",")
+
+        if groups() == :absent
+            is = []
+        else
+            is = groups().split(",")
+        end
+
+        modes = {}
+        [is, should].flatten.uniq.each do |group|
+            # Skip it when they're in both
+            next if is.include?(group) and should.include?(group)
+
+            # We're adding a group.
+            modes[group] = :add and next unless is.include?(group)
+
+            # We're removing a group.
+            modes[group] = :remove and next unless should.include?(group)
+        end
+
+        modes.each do |group, form|
+            self.fail "Could not find ldap group %s" % group unless ldap_group = group_manager.find(group)
+
+            current = ldap_group[:members]
+
+            if form == :add
+                if current.is_a?(Array) and ! current.empty?
+                    new = current + [name]
+                else
+                    new = [name]
+                end
+            else
+                new = current - [name]
+                new = :absent if new.empty?
+            end
+
+            group_manager.update(group, {:ensure => :present, :members => current}, {:ensure => :present, :members => new})
+        end
+    end
+
+    # Convert a gropu name to an id.
+    def group2id(group)
+        Puppet::Type.type(:group).provider(:ldap).name2id(group)
+    end
+
+    private
+
+    def group_manager
+        Puppet::Type.type(:group).provider(:ldap).manager
+    end
+
+    def group_properties(values)
+        if values.empty? or values == :absent
+            {:ensure => :present}
+        else
+            {:ensure => :present, :members => values}
+        end
+    end
+end

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

@@ -25,7 +25,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     def addcmd
         cmd = [command(:add)]
-        @resource.class.validproperties.each do |property|
+        Puppet::Type.type(:user).validproperties.each do |property|
             next if property == :ensure
             # the value needs to be quoted, mostly because -c might
             # have spaces in it

data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb

@@ -1,17 +1,17 @@
 class AddCreatedAtToAllTables < ActiveRecord::Migration
-  def self.up
-    ActiveRecord::Base.connection.tables.each do |t|
-      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-        add_column t.to_s, :created_at, :datetime 
-      end  
-    end 
-  end
+    def self.up
+        ActiveRecord::Base.connection.tables.each do |t|
+            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+                add_column t.to_s, :created_at, :datetime 
+            end    
+        end 
+    end
 
-  def self.down
-    ActiveRecord::Base.connection.tables.each do |t|
-      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
-        remove_column t.to_s, :created_at
-      end  
-    end  
-  end
+    def self.down
+        ActiveRecord::Base.connection.tables.each do |t|
+            unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+                remove_column t.to_s, :created_at
+            end    
+        end    
+    end
 end

data/lib/puppet/rails/database/schema.rb

@@ -14,6 +14,7 @@ class Puppet::Rails::Schema
                     t.column :exported, :boolean
                     t.column :line, :integer
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :resources, :id, :integer => true
                 add_index :resources, :host_id, :integer => true
@@ -31,6 +32,7 @@ class Puppet::Rails::Schema
                     t.column :filename, :string
                     t.column :path, :string
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :source_files, :id, :integer => true
                 add_index :source_files, :filename
@@ -39,6 +41,7 @@ class Puppet::Rails::Schema
                     t.column :resource_id, :integer
                     t.column :puppet_tag_id, :integer
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :resource_tags, :id, :integer => true
                 add_index :resource_tags, :resource_id, :integer => true
@@ -47,6 +50,7 @@ class Puppet::Rails::Schema
                 create_table :puppet_tags do |t| 
                     t.column :name, :string
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :puppet_tags, :id, :integer => true
 
@@ -59,6 +63,7 @@ class Puppet::Rails::Schema
                     #Use updated_at to automatically add timestamp on save.
                     t.column :updated_at, :datetime
                     t.column :source_file_id, :integer
+                    t.column :created_at, :datetime
                 end
                 add_index :hosts, :id, :integer => true
                 add_index :hosts, :source_file_id, :integer => true
@@ -67,6 +72,7 @@ class Puppet::Rails::Schema
                 create_table :fact_names do |t| 
                     t.column :name, :string, :null => false
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :fact_names, :id, :integer => true
                 add_index :fact_names, :name
@@ -76,6 +82,7 @@ class Puppet::Rails::Schema
                     t.column :fact_name_id, :integer, :null => false
                     t.column :host_id, :integer, :null => false
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end 
                 add_index :fact_values, :id, :integer => true
                 add_index :fact_values, :fact_name_id, :integer => true
@@ -87,6 +94,7 @@ class Puppet::Rails::Schema
                     t.column :line, :integer
                     t.column :resource_id, :integer
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :param_values, :id, :integer => true
                 add_index :param_values, :param_name_id, :integer => true
@@ -95,6 +103,7 @@ class Puppet::Rails::Schema
                 create_table :param_names do |t| 
                     t.column :name, :string, :null => false
                     t.column :updated_at, :datetime
+                    t.column :created_at, :datetime
                 end
                 add_index :param_names, :id, :integer => true
                 add_index :param_names, :name