tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed duplicate includes and OpenBSD dependencies in user module.

Browse source
This commit is contained in:
Ossi Salmi 2010-06-07 16:39:23 +03:00 • committed by Timo Mkinen
parent 8e3cac8b51
commit bce47c00d7
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
user/scripts/update-classes.rb
View file

@ -58,9 +58,8 @@ conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, 'objectClass=posixAccount',
# create user class # create user class
if entry['uid'][0] !~ /.*\$.*/ if entry['uid'][0] !~ /.*\$.*/
print "class user::" + entry['uid'][0] + " {\n" print "class user::" + entry['uid'][0] + " inherits user::virtual {\n"
print " include user::virtual\n" print " realize(Newuser['" + entry['uid'][0] + "'])\n"
print " realize(User::Virtual::Newuser['" + entry['uid'][0] + "'])\n"
groups.each do |group| groups.each do |group|
print " realize(Group['" + group + "'])\n" print " realize(Group['" + group + "'])\n"
end end
@ -91,7 +90,7 @@ conn.search(basedn, LDAP::LDAP_SCOPE_SUBTREE, 'objectClass=posixGroup',
end end
if members.length > 0 if members.length > 0
print "class user::group::" + entry['cn'][0] + " {\n" print "class user::group::" + entry['cn'][0] + " {\n"
members.each do |member| members.uniq.sort.each do |member|
print " include user::" + member + "\n" print " include user::" + member + "\n"
end end
print "}\n\n" print "}\n\n"

1
user/scripts/update-virtual.rb
View file

@ -64,6 +64,7 @@ class user::virtual {
command => "usermod -L ldap ${name}", command => "usermod -L ldap ${name}",
path => "/sbin:/usr/sbin:/bin:/usr/bin", path => "/sbin:/usr/sbin:/bin:/usr/bin",
refreshonly => true, refreshonly => true,
require => File["/etc/login.conf"],
} }
exec { "user-home-${name}": exec { "user-home-${name}":