Merge pull request #62 from 0x46616c6b/user-add-skeleton-support
Add support for skeleton directory (useradd -k) in user module
This commit is contained in:
commit
072c4f38ea
1 changed files with 37 additions and 3 deletions
|
@ -74,6 +74,10 @@ options:
|
|||
required: false
|
||||
description:
|
||||
- Optionally set the user's home directory.
|
||||
skeleton:
|
||||
required: false
|
||||
description:
|
||||
- Optionally set a home skeleton directory. Requires createhome option!
|
||||
password:
|
||||
required: false
|
||||
description:
|
||||
|
@ -259,6 +263,7 @@ class User(object):
|
|||
self.remove = module.params['remove']
|
||||
self.createhome = module.params['createhome']
|
||||
self.move_home = module.params['move_home']
|
||||
self.skeleton = module.params['skeleton']
|
||||
self.system = module.params['system']
|
||||
self.login_class = module.params['login_class']
|
||||
self.append = module.params['append']
|
||||
|
@ -363,6 +368,10 @@ class User(object):
|
|||
|
||||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
else:
|
||||
cmd.append('-M')
|
||||
|
||||
|
@ -638,10 +647,14 @@ class User(object):
|
|||
|
||||
def create_homedir(self, path):
|
||||
if not os.path.exists(path):
|
||||
# use /etc/skel if possible
|
||||
if os.path.exists('/etc/skel'):
|
||||
if self.skeleton is not None:
|
||||
skeleton = self.skeleton
|
||||
else:
|
||||
skeleton = '/etc/skel'
|
||||
|
||||
if os.path.exists(skeleton):
|
||||
try:
|
||||
shutil.copytree('/etc/skel', path, symlinks=True)
|
||||
shutil.copytree(skeleton, path, symlinks=True)
|
||||
except OSError, e:
|
||||
self.module.exit_json(failed=True, msg="%s" % e)
|
||||
else:
|
||||
|
@ -729,6 +742,10 @@ class FreeBsdUser(User):
|
|||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
|
||||
if self.shell is not None:
|
||||
cmd.append('-s')
|
||||
cmd.append(self.shell)
|
||||
|
@ -923,6 +940,10 @@ class OpenBSDUser(User):
|
|||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
|
||||
cmd.append(self.name)
|
||||
return self.execute_command(cmd)
|
||||
|
||||
|
@ -1091,6 +1112,10 @@ class NetBSDUser(User):
|
|||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
|
||||
cmd.append(self.name)
|
||||
return self.execute_command(cmd)
|
||||
|
||||
|
@ -1243,6 +1268,10 @@ class SunOS(User):
|
|||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
|
||||
cmd.append(self.name)
|
||||
|
||||
if self.module.check_mode:
|
||||
|
@ -1751,6 +1780,10 @@ class AIX(User):
|
|||
if self.createhome:
|
||||
cmd.append('-m')
|
||||
|
||||
if self.skeleton is not None:
|
||||
cmd.append('-k')
|
||||
cmd.append(self.skeleton)
|
||||
|
||||
cmd.append(self.name)
|
||||
(rc, out, err) = self.execute_command(cmd)
|
||||
|
||||
|
@ -2022,6 +2055,7 @@ def main():
|
|||
remove=dict(default='no', type='bool'),
|
||||
# following options are specific to useradd
|
||||
createhome=dict(default='yes', type='bool'),
|
||||
skeleton=dict(default=None, type='str'),
|
||||
system=dict(default='no', type='bool'),
|
||||
# following options are specific to usermod
|
||||
move_home=dict(default='no', type='bool'),
|
||||
|
|
Loading…
Reference in a new issue