cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- usermod -G doesn't mean what puppet thinks it means, so use -S so actually

Browse Source 
set groups. this allows puppet to revoke group membership for a user.
- make 'chage' and 'password' optional commands

reminded and tested by sebastia@
This commit is contained in:
jasper 2014-11-04 09:03:58 +00:00
parent 179a50a618
commit 7611f74f33
3 changed files with 76 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/ruby-puppet/3/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.91 2014/10/30 12:21:37 jasper Exp $
# $OpenBSD: Makefile,v 1.92 2014/11/04 09:03:58 jasper Exp $
VERSION= 3.7.2
REVISION= 1
REVISION= 2
RUN_DEPENDS+= archivers/gtar \
devel/ruby-rgen,${MODRUBY_FLAVOR}

37
sysutils/ruby-puppet/3/patches/patch-lib_puppet_provider_nameservice_objectadd_rb Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-lib_puppet_provider_nameservice_objectadd_rb,v 1.1 2014/11/04 09:03:58 jasper Exp $
- use '-S' to update group membership on OpenBSD
--- lib/puppet/provider/nameservice/objectadd.rb.orig Sun Nov 2 20:53:06 2014
+++ lib/puppet/provider/nameservice/objectadd.rb Sun Nov 2 20:53:14 2014
@@ -14,7 +14,13 @@ class ObjectAdd < Puppet::Provider::NameService
def modifycmd(param, value)
cmd = [command(param.to_s =~ /password_.+_age/ ? :password : :modify)]
- cmd << flag(param) << value
+ debug "param: #{param} value: #{value}"
+ # Modifying groups may use different flags as for setting groups
+ if param == :groups
+ cmd << modifygroupsflag << value
+ else
+ cmd << flag(param) << value
+ end
if @resource.allowdupe? && ((param == :uid) || (param == :gid and self.class.name == :groupadd))
cmd << "-o"
end
@@ -28,6 +34,15 @@ class ObjectAdd < Puppet::Provider::NameService
method = self.class.option(name, :method) || name
method
+ end
+
+ def modifygroupsflag
+ case Facter.value(:osfamily)
+ when 'OpenBSD'
+ '-S'
+ else
+ flag(:groups)
+ end
end
end
end

42
sysutils/ruby-puppet/3/patches/patch-lib_puppet_provider_user_useradd_rb
View File

@ -1,12 +1,16 @@
$OpenBSD: patch-lib_puppet_provider_user_useradd_rb,v 1.3 2014/10/30 12:21:37 jasper Exp $
$OpenBSD: patch-lib_puppet_provider_user_useradd_rb,v 1.4 2014/11/04 09:03:58 jasper Exp $
- add new 'loginclass' attribute to the 'user' type
- make 'chage' an optional command
--- lib/puppet/provider/user/useradd.rb.orig Tue Oct 21 23:52:27 2014
+++ lib/puppet/provider/user/useradd.rb Thu Oct 30 12:16:26 2014
+++ lib/puppet/provider/user/useradd.rb Sun Nov 2 20:55:27 2014
@@ -9,7 +9,7 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
install Ruby's shadow password library (often known as `ruby-libshadow`)
if you wish to manage user passwords."
- commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage"
+ commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "passwd"
+ commands :add => "useradd", :delete => "userdel", :modify => "usermod"
options :home, :flag => "-d", :method => :dir
options :comment, :method => :gecos
@ -18,7 +22,16 @@ $OpenBSD: patch-lib_puppet_provider_user_useradd_rb,v 1.3 2014/10/30 12:21:37 ja
options :expiry, :method => :sp_expire,
:munge => proc { |value|
if value == :absent
@@ -159,6 +160,7 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
@@ -42,6 +43,8 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
}
optional_commands :localadd => "luseradd"
+ optional_commands :chage => "chage"
+ optional_commands :password => "passwd"
has_feature :libuser if Puppet.features.libuser?
def exists?
@@ -159,6 +162,7 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
next if property.to_s =~ /password_.+_age/
next if property == :groups and @resource.forcelocal?
next if property == :expiry and @resource.forcelocal?
@ -26,7 +39,26 @@ $OpenBSD: patch-lib_puppet_provider_user_useradd_rb,v 1.3 2014/10/30 12:21:37 ja
# the value needs to be quoted, mostly because -c might
# have spaces in it
if value = @resource.should(property) and value != ""
@@ -200,7 +202,7 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
@@ -191,16 +195,25 @@ Puppet::Type.type(:user).provide :useradd, :parent =>
cmd << @resource[:name]
end
+ def self.passwordcmd
+ case Facter.value(:operatingsystem)
+ when 'OpenBSD'
+ command(:password)
+ else
+ command(:chage)
+ end
+ end
+
def passcmd
age_limits = [:password_min_age, :password_max_age].select { |property| @resource.should(property) }
if age_limits.empty?
nil
else
- [command(:password),age_limits.collect { |property| [flag(property), @resource.should(property)]}, @resource[:name]].flatten
+ [passwordcmd,age_limits.collect { |property| [flag(property), @resource.should(property)]}, @resource[:name]].flatten
end
end