valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to NetBSD groupadd/useradd

Browse Source 
* Add NetBSD to groupadd/useradd
* Add NetBSD exclusion to shadow
* Skip useradd system flag for NetBSD
This commit is contained in:
Anthony Johnson 2013-05-19 04:28:37 +00:00
parent 43c731a75a
commit fd06ef830d
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/groupadd.py
View File

@ -13,7 +13,10 @@ def __virtual__():
''' '''
Set the user module if the kernel is Linux or OpenBSD Set the user module if the kernel is Linux or OpenBSD
''' '''
return 'group' if __grains__['kernel'] in ('Linux', 'OpenBSD') else False return (
'group' if __grains__['kernel'] in ('Linux', 'OpenBSD', 'NetBSD')
else False
)
def add(name, gid=None, system=False): def add(name, gid=None, system=False):

4
salt/modules/shadow.py
View File

@ -19,7 +19,9 @@ def __virtual__():
''' '''
# Disable on Windows, a specific file module exists: # Disable on Windows, a specific file module exists:
if salt.utils.is_windows() or __grains__['kernel'] == 'SunOS': if salt.utils.is_windows() or __grains__['kernel'] in (
'SunOS', 'NetBSD'
):
return False return False
return 'shadow' return 'shadow'

4
salt/modules/useradd.py
View File

@ -34,7 +34,8 @@ def __virtual__():
'list_groups', 'list_users', '__virtual__'): 'list_groups', 'list_users', '__virtual__'):
delattr(mod, attr) delattr(mod, attr)
return ( return (
'user' if __grains__['kernel'] in ('Linux', 'Darwin', 'OpenBSD') 'user' if __grains__['kernel'] in ('Linux', 'Darwin', 'OpenBSD',
'NetBSD')
else False else False
) )
@ -120,6 +121,7 @@ def add(name,
if not unique: if not unique:
cmd += '-o ' cmd += '-o '
if system: if system:
if not __grains__['kernel'] == 'NetBSD':
cmd += '-r ' cmd += '-r '
cmd += name cmd += name
ret = __salt__['cmd.run_all'](cmd)['retcode'] ret = __salt__['cmd.run_all'](cmd)['retcode']

10
salt/states/user.py
View File

@ -49,7 +49,7 @@ def _changes(name,
otherwise return False. otherwise return False.
''' '''
if __grains__['os'] not in ('FreeBSD', 'OpenBSD'): if __grains__['os'] not in ('FreeBSD', 'OpenBSD', 'NetBSD'):
lshad = __salt__['shadow.info'](name) lshad = __salt__['shadow.info'](name)
lusr = __salt__['user.info'](name) lusr = __salt__['user.info'](name)
@ -96,7 +96,7 @@ def _changes(name,
if lusr['shell'] != shell: if lusr['shell'] != shell:
change['shell'] = shell change['shell'] = shell
if password: if password:
if __grains__['os'] not in ('FreeBSD', 'OpenBSD'): if __grains__['os'] not in ('FreeBSD', 'OpenBSD', 'NetBSD'):
if lshad['pwd'] == '!' or \ if lshad['pwd'] == '!' or \
lshad['pwd'] != '!' and enforce_password: lshad['pwd'] != '!' and enforce_password:
if lshad['pwd'] != password: if lshad['pwd'] != password:
@ -263,7 +263,7 @@ def present(name,
ret['comment'] += '{0}: {1}\n'.format(key, val) ret['comment'] += '{0}: {1}\n'.format(key, val)
return ret return ret
# The user is present # The user is present
if not __grains__['os'] in ('FreeBSD', 'OpenBSD'): if not __grains__['os'] in ('FreeBSD', 'OpenBSD', 'NetBSD'):
lshad = __salt__['shadow.info'](name) lshad = __salt__['shadow.info'](name)
pre = __salt__['user.info'](name) pre = __salt__['user.info'](name)
for key, val in changes.items(): for key, val in changes.items():
@ -282,14 +282,14 @@ def present(name,
post = __salt__['user.info'](name) post = __salt__['user.info'](name)
spost = {} spost = {}
if __grains__['os'] not in ('FreeBSD', 'OpenBSD'): if __grains__['os'] not in ('FreeBSD', 'OpenBSD', 'NetBSD'):
if lshad['pwd'] != password: if lshad['pwd'] != password:
spost = __salt__['shadow.info'](name) spost = __salt__['shadow.info'](name)
# See if anything changed # See if anything changed
for key in post: for key in post:
if post[key] != pre[key]: if post[key] != pre[key]:
ret['changes'][key] = post[key] ret['changes'][key] = post[key]
if __grains__['os'] not in ('FreeBSD', 'OpenBSD'): if __grains__['os'] not in ('FreeBSD', 'OpenBSD', 'NetBSD'):
for key in spost: for key in spost:
if lshad[key] != spost[key]: if lshad[key] != spost[key]:
ret['changes'][key] = spost[key] ret['changes'][key] = spost[key]