|
|
|
@ -110,6 +110,8 @@ def user_add(user, **kwargs):
|
|
|
|
|
cmd.append('-m')
|
|
|
|
|
else:
|
|
|
|
|
cmd.append('-M')
|
|
|
|
|
elif key == 'system' and kwargs[key] == 'yes':
|
|
|
|
|
cmd.append('-r')
|
|
|
|
|
cmd.append(user)
|
|
|
|
|
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
|
|
|
if rc == 0:
|
|
|
|
@ -269,6 +271,7 @@ remove = params.get('remove', False)
|
|
|
|
|
# ===========================================
|
|
|
|
|
# following options are specific to useradd
|
|
|
|
|
createhome = params.get('createhome', 'yes')
|
|
|
|
|
system = params.get('system', 'no')
|
|
|
|
|
|
|
|
|
|
# ===========================================
|
|
|
|
|
# following options are specific to usermod
|
|
|
|
@ -278,6 +281,8 @@ if state not in [ 'present', 'absent' ]:
|
|
|
|
|
fail_json(msg='invalid state')
|
|
|
|
|
if createhome not in [ 'yes', 'no' ]:
|
|
|
|
|
fail_json(msg='invalid createhome')
|
|
|
|
|
if system not in ['yes', 'no']:
|
|
|
|
|
fail_json(msg='invalid system')
|
|
|
|
|
if append not in [ 'yes', 'no' ]:
|
|
|
|
|
fail_json(msg='invalid append')
|
|
|
|
|
if name is None:
|
|
|
|
@ -293,7 +298,8 @@ elif state == 'present':
|
|
|
|
|
if not user_exists(name):
|
|
|
|
|
changed = user_add(name, uid=uid, group=group, groups=groups,
|
|
|
|
|
comment=comment, home=home, shell=shell,
|
|
|
|
|
password=password, createhome=createhome)
|
|
|
|
|
password=password, createhome=createhome,
|
|
|
|
|
system=system)
|
|
|
|
|
else:
|
|
|
|
|
changed = user_mod(name, uid=uid, group=group, groups=groups,
|
|
|
|
|
comment=comment, home=home, shell=shell,
|
|
|
|
|