[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Jesse Wolfe]

The following commit has been merged in the experimental branch:
commit 1a7f0dc6c4bfe4ce716ddfd918be181c8d682229
Merge: 54f15b6eae233c291ef14c4224ee1280aa09761e fb339cbbc17cd14ba34df624fe9a2b9c74640eb5
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Mar 29 14:38:17 2011 -0700

    Merge branch 'feature/master/5432' of https://github.com/keymon/puppet into next

diff --combined lib/puppet/type/user.rb
index f74e426,b2cafad..7679593
--- a/lib/puppet/type/user.rb
+++ b/lib/puppet/type/user.rb
@@@ -12,9 -12,7 +12,9 @@@ module Puppe
  
        This resource type uses the prescribed native tools for creating
        groups and generally uses POSIX APIs for retrieving information
 -      about them.  It does not directly modify `/etc/passwd` or anything."
 +      about them.  It does not directly modify `/etc/passwd` or anything.
-       
++
 +      **Autorequires:** If Puppet is managing the user's primary group (as provided in the `gid` attribute), the user resource will autorequire that group. If Puppet is managing any role accounts corresponding to the user's roles, the user resource will autorequire those role accounts."
  
      feature :allows_duplicates,
        "The provider supports duplicate users with the same UID."
@@@ -36,9 -34,9 +36,12 @@@
      feature :manages_expiry,
        "The provider can manage the expiry date for a user."
  
 +   feature :system_users,
 +     "The provider allows you to create system users with lower UIDs."
 +
+     feature :manages_aix_lam,
+       "The provider can manage AIX Loadable Authentication Module (LAM) system."
+ 
      newproperty(:ensure, :parent => Puppet::Property::Ensure) do
        newvalue(:present, :event => :user_created) do
          provider.create
@@@ -117,6 -115,8 +120,6 @@@
        end
  
        def insync?(is)
 -        return true unless self.should
 -
          # We know the 'is' is a number, so we need to convert the 'should' to a number,
          # too.
          @should.each do |value|
@@@ -180,7 -180,7 +183,7 @@@
        end
  
        validate do |value|
 -        if value.to_s !~ /^\d+$/
 +        if value.to_s !~ /^-?\d+$/
            raise ArgumentError, "Password minimum age must be provided as a number"
          end
        end
@@@ -199,7 -199,7 +202,7 @@@
        end
  
        validate do |value|
 -        if value.to_s !~ /^\d+$/
 +        if value.to_s !~ /^-?\d+$/
            raise ArgumentError, "Password maximum age must be provided as a number"
          end
        end
@@@ -235,14 -235,6 +238,14 @@@
        defaultto :minimum
      end
  
 +    newparam(:system, :boolean => true) do
 +      desc "Whether the user is a system user with lower UID."
 +
 +      newvalues(:true, :false)
 +
 +      defaultto false
 +    end
 +
      newparam(:allowdupe, :boolean => true) do
        desc "Whether to allow duplicate UIDs."
  
@@@ -445,5 -437,39 +448,39 @@@
      newproperty(:project, :required_features => :manages_solaris_rbac) do
        desc "The name of the project associated with a user"
      end
+ 
+     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
+       desc "The name of the I&A module to use to manage this user"
+ 
+       defaultto "compat"
+     end
+ 
+     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
+       desc "Specify user AIX attributes in an array of keyvalue pairs"
+ 
+       def membership
+         :attribute_membership
+       end
 -      
++
+       def delimiter
+         " "
+       end
+ 
+       validate do |value|
+         raise ArgumentError, "Attributes value pairs must be seperated by an =" unless value.include?("=")
+       end
+     end
+ 
+     newparam(:attribute_membership) do
+       desc "Whether specified attribute value pairs should be treated as the only attributes
+         of the user or whether they should merely
+         be treated as the minimum list."
+ 
+       newvalues(:inclusive, :minimum)
 -      
++
+       defaultto :minimum
+     end
+ 
+ 
    end
  end

-- 
Puppet packaging for Debian