mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 22:02:50 +00:00
Bulk autopep8 (modules)
As agreed in 2017-12-07 Core meeting bulk fix pep8 issues Generated using: autopep8 1.3.3 (pycodestyle: 2.3.1) autopep8 -r --max-line-length 160 --in-place --ignore E305,E402,E722,E741 lib/ansible/modules Manually fix issues that autopep8 has introduced
This commit is contained in:
John Barker
committed by
John R Barker
John R Barker
parent
d13d7e9404
commit
c57a7f05e1
@@ -94,21 +94,21 @@ from ansible.module_utils.univention_umc import (
|
||||
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
type = dict(required=True,
|
||||
type='str'),
|
||||
zone = dict(required=True,
|
||||
type='str'),
|
||||
name = dict(required=True,
|
||||
type='str'),
|
||||
data = dict(default=[],
|
||||
type='dict'),
|
||||
state = dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
argument_spec=dict(
|
||||
type=dict(required=True,
|
||||
type='str'),
|
||||
zone=dict(required=True,
|
||||
type='str'),
|
||||
name=dict(required=True,
|
||||
type='str'),
|
||||
data=dict(default=[],
|
||||
type='dict'),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if = ([
|
||||
required_if=([
|
||||
('state', 'present', ['data'])
|
||||
])
|
||||
)
|
||||
@@ -116,12 +116,12 @@ def main():
|
||||
if not HAVE_UNIVENTION:
|
||||
module.fail_json(msg="This module requires univention python bindings")
|
||||
|
||||
type = module.params['type']
|
||||
zone = module.params['zone']
|
||||
name = module.params['name']
|
||||
data = module.params['data']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
type = module.params['type']
|
||||
zone = module.params['zone']
|
||||
name = module.params['name']
|
||||
data = module.params['data']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
|
||||
obj = list(ldap_search(
|
||||
'(&(objectClass=dNSZone)(zoneName={})(relativeDomainName={}))'.format(zone, name),
|
||||
|
||||
@@ -111,10 +111,10 @@ from ansible.module_utils.univention_umc import (
|
||||
def convert_time(time):
|
||||
"""Convert a time in seconds into the biggest unit"""
|
||||
units = [
|
||||
(24 * 60 * 60 , 'days'),
|
||||
(60 * 60 , 'hours'),
|
||||
(60 , 'minutes'),
|
||||
(1 , 'seconds'),
|
||||
(24 * 60 * 60, 'days'),
|
||||
(60 * 60, 'hours'),
|
||||
(60, 'minutes'),
|
||||
(1, 'seconds'),
|
||||
]
|
||||
|
||||
if time == 0:
|
||||
@@ -126,49 +126,49 @@ def convert_time(time):
|
||||
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
type = dict(required=True,
|
||||
type='str'),
|
||||
zone = dict(required=True,
|
||||
aliases=['name'],
|
||||
type='str'),
|
||||
nameserver = dict(default=[],
|
||||
type='list'),
|
||||
interfaces = dict(default=[],
|
||||
type='list'),
|
||||
refresh = dict(default=3600,
|
||||
type='int'),
|
||||
retry = dict(default=1800,
|
||||
type='int'),
|
||||
expire = dict(default=604800,
|
||||
type='int'),
|
||||
ttl = dict(default=600,
|
||||
type='int'),
|
||||
contact = dict(default='',
|
||||
type='str'),
|
||||
mx = dict(default=[],
|
||||
type='list'),
|
||||
state = dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
argument_spec=dict(
|
||||
type=dict(required=True,
|
||||
type='str'),
|
||||
zone=dict(required=True,
|
||||
aliases=['name'],
|
||||
type='str'),
|
||||
nameserver=dict(default=[],
|
||||
type='list'),
|
||||
interfaces=dict(default=[],
|
||||
type='list'),
|
||||
refresh=dict(default=3600,
|
||||
type='int'),
|
||||
retry=dict(default=1800,
|
||||
type='int'),
|
||||
expire=dict(default=604800,
|
||||
type='int'),
|
||||
ttl=dict(default=600,
|
||||
type='int'),
|
||||
contact=dict(default='',
|
||||
type='str'),
|
||||
mx=dict(default=[],
|
||||
type='list'),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if = ([
|
||||
required_if=([
|
||||
('state', 'present', ['nameserver', 'interfaces'])
|
||||
])
|
||||
)
|
||||
type = module.params['type']
|
||||
zone = module.params['zone']
|
||||
nameserver = module.params['nameserver']
|
||||
interfaces = module.params['interfaces']
|
||||
refresh = module.params['refresh']
|
||||
retry = module.params['retry']
|
||||
expire = module.params['expire']
|
||||
ttl = module.params['ttl']
|
||||
contact = module.params['contact']
|
||||
mx = module.params['mx']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
type = module.params['type']
|
||||
zone = module.params['zone']
|
||||
nameserver = module.params['nameserver']
|
||||
interfaces = module.params['interfaces']
|
||||
refresh = module.params['refresh']
|
||||
retry = module.params['retry']
|
||||
expire = module.params['expire']
|
||||
ttl = module.params['ttl']
|
||||
contact = module.params['contact']
|
||||
mx = module.params['mx']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
|
||||
obj = list(ldap_search(
|
||||
'(&(objectClass=dNSZone)(zoneName={}))'.format(zone),
|
||||
@@ -187,15 +187,15 @@ def main():
|
||||
obj = umc_module_for_add('dns/{}'.format(type), container)
|
||||
else:
|
||||
obj = umc_module_for_edit('dns/{}'.format(type), dn)
|
||||
obj['zone'] = zone
|
||||
obj['nameserver'] = nameserver
|
||||
obj['a'] = interfaces
|
||||
obj['refresh'] = convert_time(refresh)
|
||||
obj['retry'] = convert_time(retry)
|
||||
obj['expire'] = convert_time(expire)
|
||||
obj['ttl'] = convert_time(ttl)
|
||||
obj['contact'] = contact
|
||||
obj['mx'] = mx
|
||||
obj['zone'] = zone
|
||||
obj['nameserver'] = nameserver
|
||||
obj['a'] = interfaces
|
||||
obj['refresh'] = convert_time(refresh)
|
||||
obj['retry'] = convert_time(retry)
|
||||
obj['expire'] = convert_time(expire)
|
||||
obj['ttl'] = convert_time(ttl)
|
||||
obj['contact'] = contact
|
||||
obj['mx'] = mx
|
||||
diff = obj.diff()
|
||||
if exists:
|
||||
for k in obj.keys():
|
||||
|
||||
@@ -87,30 +87,30 @@ from ansible.module_utils.univention_umc import (
|
||||
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
name = dict(required=True,
|
||||
type='str'),
|
||||
description = dict(default=None,
|
||||
type='str'),
|
||||
position = dict(default='',
|
||||
type='str'),
|
||||
ou = dict(default='',
|
||||
type='str'),
|
||||
subpath = dict(default='cn=groups',
|
||||
type='str'),
|
||||
state = dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
argument_spec=dict(
|
||||
name=dict(required=True,
|
||||
type='str'),
|
||||
description=dict(default=None,
|
||||
type='str'),
|
||||
position=dict(default='',
|
||||
type='str'),
|
||||
ou=dict(default='',
|
||||
type='str'),
|
||||
subpath=dict(default='cn=groups',
|
||||
type='str'),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
),
|
||||
supports_check_mode=True
|
||||
)
|
||||
name = module.params['name']
|
||||
name = module.params['name']
|
||||
description = module.params['description']
|
||||
position = module.params['position']
|
||||
ou = module.params['ou']
|
||||
subpath = module.params['subpath']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
position = module.params['position']
|
||||
ou = module.params['ou']
|
||||
subpath = module.params['subpath']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
|
||||
groups = list(ldap_search(
|
||||
'(&(objectClass=posixGroup)(cn={}))'.format(name),
|
||||
@@ -134,8 +134,8 @@ def main():
|
||||
grp = umc_module_for_add('groups/group', container)
|
||||
else:
|
||||
grp = umc_module_for_edit('groups/group', group_dn)
|
||||
grp['name'] = name
|
||||
grp['description'] = description
|
||||
grp['name'] = name
|
||||
grp['description'] = description
|
||||
diff = grp.diff()
|
||||
changed = grp.diff() != []
|
||||
if not module.check_mode:
|
||||
|
||||
@@ -380,162 +380,162 @@ from ansible.module_utils.univention_umc import (
|
||||
|
||||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
name = dict(required=True,
|
||||
type='str'),
|
||||
ou = dict(required=True,
|
||||
type='str'),
|
||||
owner = dict(type='str',
|
||||
default='0'),
|
||||
group = dict(type='str',
|
||||
default='0'),
|
||||
path = dict(type='path',
|
||||
default=None),
|
||||
directorymode = dict(type='str',
|
||||
default='00755'),
|
||||
host = dict(type='str',
|
||||
default=None),
|
||||
root_squash = dict(type='bool',
|
||||
default=True),
|
||||
subtree_checking = dict(type='bool',
|
||||
default=True),
|
||||
sync = dict(type='str',
|
||||
default='sync'),
|
||||
writeable = dict(type='bool',
|
||||
default=True),
|
||||
sambaBlockSize = dict(type='str',
|
||||
aliases=['samba_block_size'],
|
||||
default=None),
|
||||
sambaBlockingLocks = dict(type='bool',
|
||||
aliases=['samba_blocking_locks'],
|
||||
default=True),
|
||||
sambaBrowseable = dict(type='bool',
|
||||
aliases=['samba_browsable'],
|
||||
default=True),
|
||||
sambaCreateMode = dict(type='str',
|
||||
aliases=['samba_create_mode'],
|
||||
default='0744'),
|
||||
sambaCscPolicy = dict(type='str',
|
||||
aliases=['samba_csc_policy'],
|
||||
default='manual'),
|
||||
sambaCustomSettings = dict(type='list',
|
||||
aliases=['samba_custom_settings'],
|
||||
default=[]),
|
||||
sambaDirectoryMode = dict(type='str',
|
||||
aliases=['samba_directory_mode'],
|
||||
default='0755'),
|
||||
sambaDirectorySecurityMode = dict(type='str',
|
||||
aliases=['samba_directory_security_mode'],
|
||||
default='0777'),
|
||||
sambaDosFilemode = dict(type='bool',
|
||||
aliases=['samba_dos_filemode'],
|
||||
default=False),
|
||||
sambaFakeOplocks = dict(type='bool',
|
||||
aliases=['samba_fake_oplocks'],
|
||||
default=False),
|
||||
sambaForceCreateMode = dict(type='bool',
|
||||
aliases=['samba_force_create_mode'],
|
||||
default=False),
|
||||
sambaForceDirectoryMode = dict(type='bool',
|
||||
aliases=['samba_force_directory_mode'],
|
||||
default=False),
|
||||
sambaForceDirectorySecurityMode = dict(type='bool',
|
||||
aliases=['samba_force_directory_security_mode'],
|
||||
default=False),
|
||||
sambaForceGroup = dict(type='str',
|
||||
aliases=['samba_force_group'],
|
||||
default=None),
|
||||
sambaForceSecurityMode = dict(type='bool',
|
||||
aliases=['samba_force_security_mode'],
|
||||
default=False),
|
||||
sambaForceUser = dict(type='str',
|
||||
aliases=['samba_force_user'],
|
||||
default=None),
|
||||
sambaHideFiles = dict(type='str',
|
||||
aliases=['samba_hide_files'],
|
||||
default=None),
|
||||
sambaHideUnreadable = dict(type='bool',
|
||||
aliases=['samba_hide_unreadable'],
|
||||
default=False),
|
||||
sambaHostsAllow = dict(type='list',
|
||||
aliases=['samba_hosts_allow'],
|
||||
default=[]),
|
||||
sambaHostsDeny = dict(type='list',
|
||||
aliases=['samba_hosts_deny'],
|
||||
default=[]),
|
||||
sambaInheritAcls = dict(type='bool',
|
||||
aliases=['samba_inherit_acls'],
|
||||
default=True),
|
||||
sambaInheritOwner = dict(type='bool',
|
||||
aliases=['samba_inherit_owner'],
|
||||
default=False),
|
||||
sambaInheritPermissions = dict(type='bool',
|
||||
aliases=['samba_inherit_permissions'],
|
||||
default=False),
|
||||
sambaInvalidUsers = dict(type='str',
|
||||
aliases=['samba_invalid_users'],
|
||||
default=None),
|
||||
sambaLevel2Oplocks = dict(type='bool',
|
||||
aliases=['samba_level_2_oplocks'],
|
||||
default=True),
|
||||
sambaLocking = dict(type='bool',
|
||||
aliases=['samba_locking'],
|
||||
default=True),
|
||||
sambaMSDFSRoot = dict(type='bool',
|
||||
aliases=['samba_msdfs_root'],
|
||||
default=False),
|
||||
sambaName = dict(type='str',
|
||||
aliases=['samba_name'],
|
||||
default=None),
|
||||
sambaNtAclSupport = dict(type='bool',
|
||||
aliases=['samba_nt_acl_support'],
|
||||
default=True),
|
||||
sambaOplocks = dict(type='bool',
|
||||
aliases=['samba_oplocks'],
|
||||
default=True),
|
||||
sambaPostexec = dict(type='str',
|
||||
aliases=['samba_postexec'],
|
||||
default=None),
|
||||
sambaPreexec = dict(type='str',
|
||||
aliases=['samba_preexec'],
|
||||
default=None),
|
||||
sambaPublic = dict(type='bool',
|
||||
aliases=['samba_public'],
|
||||
default=False),
|
||||
sambaSecurityMode = dict(type='str',
|
||||
aliases=['samba_security_mode'],
|
||||
default='0777'),
|
||||
sambaStrictLocking = dict(type='str',
|
||||
aliases=['samba_strict_locking'],
|
||||
default='Auto'),
|
||||
sambaVFSObjects = dict(type='str',
|
||||
aliases=['samba_vfs_objects'],
|
||||
default=None),
|
||||
sambaValidUsers = dict(type='str',
|
||||
aliases=['samba_valid_users'],
|
||||
default=None),
|
||||
sambaWriteList = dict(type='str',
|
||||
aliases=['samba_write_list'],
|
||||
default=None),
|
||||
sambaWriteable = dict(type='bool',
|
||||
aliases=['samba_writeable'],
|
||||
default=True),
|
||||
nfs_hosts = dict(type='list',
|
||||
default=[]),
|
||||
nfsCustomSettings = dict(type='list',
|
||||
aliases=['nfs_custom_settings'],
|
||||
default=[]),
|
||||
state = dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
argument_spec=dict(
|
||||
name=dict(required=True,
|
||||
type='str'),
|
||||
ou=dict(required=True,
|
||||
type='str'),
|
||||
owner=dict(type='str',
|
||||
default='0'),
|
||||
group=dict(type='str',
|
||||
default='0'),
|
||||
path=dict(type='path',
|
||||
default=None),
|
||||
directorymode=dict(type='str',
|
||||
default='00755'),
|
||||
host=dict(type='str',
|
||||
default=None),
|
||||
root_squash=dict(type='bool',
|
||||
default=True),
|
||||
subtree_checking=dict(type='bool',
|
||||
default=True),
|
||||
sync=dict(type='str',
|
||||
default='sync'),
|
||||
writeable=dict(type='bool',
|
||||
default=True),
|
||||
sambaBlockSize=dict(type='str',
|
||||
aliases=['samba_block_size'],
|
||||
default=None),
|
||||
sambaBlockingLocks=dict(type='bool',
|
||||
aliases=['samba_blocking_locks'],
|
||||
default=True),
|
||||
sambaBrowseable=dict(type='bool',
|
||||
aliases=['samba_browsable'],
|
||||
default=True),
|
||||
sambaCreateMode=dict(type='str',
|
||||
aliases=['samba_create_mode'],
|
||||
default='0744'),
|
||||
sambaCscPolicy=dict(type='str',
|
||||
aliases=['samba_csc_policy'],
|
||||
default='manual'),
|
||||
sambaCustomSettings=dict(type='list',
|
||||
aliases=['samba_custom_settings'],
|
||||
default=[]),
|
||||
sambaDirectoryMode=dict(type='str',
|
||||
aliases=['samba_directory_mode'],
|
||||
default='0755'),
|
||||
sambaDirectorySecurityMode=dict(type='str',
|
||||
aliases=['samba_directory_security_mode'],
|
||||
default='0777'),
|
||||
sambaDosFilemode=dict(type='bool',
|
||||
aliases=['samba_dos_filemode'],
|
||||
default=False),
|
||||
sambaFakeOplocks=dict(type='bool',
|
||||
aliases=['samba_fake_oplocks'],
|
||||
default=False),
|
||||
sambaForceCreateMode=dict(type='bool',
|
||||
aliases=['samba_force_create_mode'],
|
||||
default=False),
|
||||
sambaForceDirectoryMode=dict(type='bool',
|
||||
aliases=['samba_force_directory_mode'],
|
||||
default=False),
|
||||
sambaForceDirectorySecurityMode=dict(type='bool',
|
||||
aliases=['samba_force_directory_security_mode'],
|
||||
default=False),
|
||||
sambaForceGroup=dict(type='str',
|
||||
aliases=['samba_force_group'],
|
||||
default=None),
|
||||
sambaForceSecurityMode=dict(type='bool',
|
||||
aliases=['samba_force_security_mode'],
|
||||
default=False),
|
||||
sambaForceUser=dict(type='str',
|
||||
aliases=['samba_force_user'],
|
||||
default=None),
|
||||
sambaHideFiles=dict(type='str',
|
||||
aliases=['samba_hide_files'],
|
||||
default=None),
|
||||
sambaHideUnreadable=dict(type='bool',
|
||||
aliases=['samba_hide_unreadable'],
|
||||
default=False),
|
||||
sambaHostsAllow=dict(type='list',
|
||||
aliases=['samba_hosts_allow'],
|
||||
default=[]),
|
||||
sambaHostsDeny=dict(type='list',
|
||||
aliases=['samba_hosts_deny'],
|
||||
default=[]),
|
||||
sambaInheritAcls=dict(type='bool',
|
||||
aliases=['samba_inherit_acls'],
|
||||
default=True),
|
||||
sambaInheritOwner=dict(type='bool',
|
||||
aliases=['samba_inherit_owner'],
|
||||
default=False),
|
||||
sambaInheritPermissions=dict(type='bool',
|
||||
aliases=['samba_inherit_permissions'],
|
||||
default=False),
|
||||
sambaInvalidUsers=dict(type='str',
|
||||
aliases=['samba_invalid_users'],
|
||||
default=None),
|
||||
sambaLevel2Oplocks=dict(type='bool',
|
||||
aliases=['samba_level_2_oplocks'],
|
||||
default=True),
|
||||
sambaLocking=dict(type='bool',
|
||||
aliases=['samba_locking'],
|
||||
default=True),
|
||||
sambaMSDFSRoot=dict(type='bool',
|
||||
aliases=['samba_msdfs_root'],
|
||||
default=False),
|
||||
sambaName=dict(type='str',
|
||||
aliases=['samba_name'],
|
||||
default=None),
|
||||
sambaNtAclSupport=dict(type='bool',
|
||||
aliases=['samba_nt_acl_support'],
|
||||
default=True),
|
||||
sambaOplocks=dict(type='bool',
|
||||
aliases=['samba_oplocks'],
|
||||
default=True),
|
||||
sambaPostexec=dict(type='str',
|
||||
aliases=['samba_postexec'],
|
||||
default=None),
|
||||
sambaPreexec=dict(type='str',
|
||||
aliases=['samba_preexec'],
|
||||
default=None),
|
||||
sambaPublic=dict(type='bool',
|
||||
aliases=['samba_public'],
|
||||
default=False),
|
||||
sambaSecurityMode=dict(type='str',
|
||||
aliases=['samba_security_mode'],
|
||||
default='0777'),
|
||||
sambaStrictLocking=dict(type='str',
|
||||
aliases=['samba_strict_locking'],
|
||||
default='Auto'),
|
||||
sambaVFSObjects=dict(type='str',
|
||||
aliases=['samba_vfs_objects'],
|
||||
default=None),
|
||||
sambaValidUsers=dict(type='str',
|
||||
aliases=['samba_valid_users'],
|
||||
default=None),
|
||||
sambaWriteList=dict(type='str',
|
||||
aliases=['samba_write_list'],
|
||||
default=None),
|
||||
sambaWriteable=dict(type='bool',
|
||||
aliases=['samba_writeable'],
|
||||
default=True),
|
||||
nfs_hosts=dict(type='list',
|
||||
default=[]),
|
||||
nfsCustomSettings=dict(type='list',
|
||||
aliases=['nfs_custom_settings'],
|
||||
default=[]),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if = ([
|
||||
required_if=([
|
||||
('state', 'present', ['path', 'host', 'sambaName'])
|
||||
])
|
||||
)
|
||||
name = module.params['name']
|
||||
state = module.params['state']
|
||||
name = module.params['name']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
|
||||
obj = list(ldap_search(
|
||||
|
||||
@@ -348,141 +348,141 @@ from ansible.module_utils.univention_umc import (
|
||||
def main():
|
||||
expiry = date.strftime(date.today() + timedelta(days=365), "%Y-%m-%d")
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
birthday = dict(default=None,
|
||||
type='str'),
|
||||
city = dict(default=None,
|
||||
type='str'),
|
||||
country = dict(default=None,
|
||||
type='str'),
|
||||
department_number = dict(default=None,
|
||||
type='str',
|
||||
aliases=['departmentNumber']),
|
||||
description = dict(default=None,
|
||||
type='str'),
|
||||
display_name = dict(default=None,
|
||||
type='str',
|
||||
aliases=['displayName']),
|
||||
email = dict(default=[''],
|
||||
type='list'),
|
||||
employee_number = dict(default=None,
|
||||
type='str',
|
||||
aliases=['employeeNumber']),
|
||||
employee_type = dict(default=None,
|
||||
type='str',
|
||||
aliases=['employeeType']),
|
||||
firstname = dict(default=None,
|
||||
type='str'),
|
||||
gecos = dict(default=None,
|
||||
type='str'),
|
||||
groups = dict(default=[],
|
||||
type='list'),
|
||||
home_share = dict(default=None,
|
||||
type='str',
|
||||
aliases=['homeShare']),
|
||||
home_share_path = dict(default=None,
|
||||
type='str',
|
||||
aliases=['homeSharePath']),
|
||||
home_telephone_number = dict(default=[],
|
||||
type='list',
|
||||
aliases=['homeTelephoneNumber']),
|
||||
homedrive = dict(default=None,
|
||||
type='str'),
|
||||
lastname = dict(default=None,
|
||||
type='str'),
|
||||
mail_alternative_address= dict(default=[],
|
||||
type='list',
|
||||
aliases=['mailAlternativeAddress']),
|
||||
mail_home_server = dict(default=None,
|
||||
type='str',
|
||||
aliases=['mailHomeServer']),
|
||||
mail_primary_address = dict(default=None,
|
||||
type='str',
|
||||
aliases=['mailPrimaryAddress']),
|
||||
mobile_telephone_number = dict(default=[],
|
||||
type='list',
|
||||
aliases=['mobileTelephoneNumber']),
|
||||
organisation = dict(default=None,
|
||||
type='str'),
|
||||
overridePWHistory = dict(default=False,
|
||||
type='bool',
|
||||
aliases=['override_pw_history']),
|
||||
overridePWLength = dict(default=False,
|
||||
type='bool',
|
||||
aliases=['override_pw_length']),
|
||||
pager_telephonenumber = dict(default=[],
|
||||
type='list',
|
||||
aliases=['pagerTelephonenumber']),
|
||||
password = dict(default=None,
|
||||
type='str',
|
||||
no_log=True),
|
||||
phone = dict(default=[],
|
||||
type='list'),
|
||||
postcode = dict(default=None,
|
||||
type='str'),
|
||||
primary_group = dict(default=None,
|
||||
type='str',
|
||||
aliases=['primaryGroup']),
|
||||
profilepath = dict(default=None,
|
||||
type='str'),
|
||||
pwd_change_next_login = dict(default=None,
|
||||
type='str',
|
||||
choices=['0', '1'],
|
||||
aliases=['pwdChangeNextLogin']),
|
||||
room_number = dict(default=None,
|
||||
type='str',
|
||||
aliases=['roomNumber']),
|
||||
samba_privileges = dict(default=[],
|
||||
type='list',
|
||||
aliases=['sambaPrivileges']),
|
||||
samba_user_workstations = dict(default=[],
|
||||
type='list',
|
||||
aliases=['sambaUserWorkstations']),
|
||||
sambahome = dict(default=None,
|
||||
type='str'),
|
||||
scriptpath = dict(default=None,
|
||||
type='str'),
|
||||
secretary = dict(default=[],
|
||||
type='list'),
|
||||
serviceprovider = dict(default=[''],
|
||||
type='list'),
|
||||
shell = dict(default='/bin/bash',
|
||||
type='str'),
|
||||
street = dict(default=None,
|
||||
type='str'),
|
||||
title = dict(default=None,
|
||||
type='str'),
|
||||
unixhome = dict(default=None,
|
||||
type='str'),
|
||||
userexpiry = dict(default=expiry,
|
||||
type='str'),
|
||||
username = dict(required=True,
|
||||
aliases=['name'],
|
||||
type='str'),
|
||||
position = dict(default='',
|
||||
type='str'),
|
||||
update_password = dict(default='always',
|
||||
choices=['always', 'on_create'],
|
||||
type='str'),
|
||||
ou = dict(default='',
|
||||
type='str'),
|
||||
subpath = dict(default='cn=users',
|
||||
type='str'),
|
||||
state = dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
argument_spec=dict(
|
||||
birthday=dict(default=None,
|
||||
type='str'),
|
||||
city=dict(default=None,
|
||||
type='str'),
|
||||
country=dict(default=None,
|
||||
type='str'),
|
||||
department_number=dict(default=None,
|
||||
type='str',
|
||||
aliases=['departmentNumber']),
|
||||
description=dict(default=None,
|
||||
type='str'),
|
||||
display_name=dict(default=None,
|
||||
type='str',
|
||||
aliases=['displayName']),
|
||||
email=dict(default=[''],
|
||||
type='list'),
|
||||
employee_number=dict(default=None,
|
||||
type='str',
|
||||
aliases=['employeeNumber']),
|
||||
employee_type=dict(default=None,
|
||||
type='str',
|
||||
aliases=['employeeType']),
|
||||
firstname=dict(default=None,
|
||||
type='str'),
|
||||
gecos=dict(default=None,
|
||||
type='str'),
|
||||
groups=dict(default=[],
|
||||
type='list'),
|
||||
home_share=dict(default=None,
|
||||
type='str',
|
||||
aliases=['homeShare']),
|
||||
home_share_path=dict(default=None,
|
||||
type='str',
|
||||
aliases=['homeSharePath']),
|
||||
home_telephone_number=dict(default=[],
|
||||
type='list',
|
||||
aliases=['homeTelephoneNumber']),
|
||||
homedrive=dict(default=None,
|
||||
type='str'),
|
||||
lastname=dict(default=None,
|
||||
type='str'),
|
||||
mail_alternative_address=dict(default=[],
|
||||
type='list',
|
||||
aliases=['mailAlternativeAddress']),
|
||||
mail_home_server=dict(default=None,
|
||||
type='str',
|
||||
aliases=['mailHomeServer']),
|
||||
mail_primary_address=dict(default=None,
|
||||
type='str',
|
||||
aliases=['mailPrimaryAddress']),
|
||||
mobile_telephone_number=dict(default=[],
|
||||
type='list',
|
||||
aliases=['mobileTelephoneNumber']),
|
||||
organisation=dict(default=None,
|
||||
type='str'),
|
||||
overridePWHistory=dict(default=False,
|
||||
type='bool',
|
||||
aliases=['override_pw_history']),
|
||||
overridePWLength=dict(default=False,
|
||||
type='bool',
|
||||
aliases=['override_pw_length']),
|
||||
pager_telephonenumber=dict(default=[],
|
||||
type='list',
|
||||
aliases=['pagerTelephonenumber']),
|
||||
password=dict(default=None,
|
||||
type='str',
|
||||
no_log=True),
|
||||
phone=dict(default=[],
|
||||
type='list'),
|
||||
postcode=dict(default=None,
|
||||
type='str'),
|
||||
primary_group=dict(default=None,
|
||||
type='str',
|
||||
aliases=['primaryGroup']),
|
||||
profilepath=dict(default=None,
|
||||
type='str'),
|
||||
pwd_change_next_login=dict(default=None,
|
||||
type='str',
|
||||
choices=['0', '1'],
|
||||
aliases=['pwdChangeNextLogin']),
|
||||
room_number=dict(default=None,
|
||||
type='str',
|
||||
aliases=['roomNumber']),
|
||||
samba_privileges=dict(default=[],
|
||||
type='list',
|
||||
aliases=['sambaPrivileges']),
|
||||
samba_user_workstations=dict(default=[],
|
||||
type='list',
|
||||
aliases=['sambaUserWorkstations']),
|
||||
sambahome=dict(default=None,
|
||||
type='str'),
|
||||
scriptpath=dict(default=None,
|
||||
type='str'),
|
||||
secretary=dict(default=[],
|
||||
type='list'),
|
||||
serviceprovider=dict(default=[''],
|
||||
type='list'),
|
||||
shell=dict(default='/bin/bash',
|
||||
type='str'),
|
||||
street=dict(default=None,
|
||||
type='str'),
|
||||
title=dict(default=None,
|
||||
type='str'),
|
||||
unixhome=dict(default=None,
|
||||
type='str'),
|
||||
userexpiry=dict(default=expiry,
|
||||
type='str'),
|
||||
username=dict(required=True,
|
||||
aliases=['name'],
|
||||
type='str'),
|
||||
position=dict(default='',
|
||||
type='str'),
|
||||
update_password=dict(default='always',
|
||||
choices=['always', 'on_create'],
|
||||
type='str'),
|
||||
ou=dict(default='',
|
||||
type='str'),
|
||||
subpath=dict(default='cn=users',
|
||||
type='str'),
|
||||
state=dict(default='present',
|
||||
choices=['present', 'absent'],
|
||||
type='str')
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if = ([
|
||||
required_if=([
|
||||
('state', 'present', ['firstname', 'lastname', 'password'])
|
||||
])
|
||||
)
|
||||
username = module.params['username']
|
||||
position = module.params['position']
|
||||
ou = module.params['ou']
|
||||
subpath = module.params['subpath']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
username = module.params['username']
|
||||
position = module.params['position']
|
||||
ou = module.params['ou']
|
||||
subpath = module.params['subpath']
|
||||
state = module.params['state']
|
||||
changed = False
|
||||
|
||||
users = list(ldap_search(
|
||||
'(&(objectClass=posixAccount)(uid={}))'.format(username),
|
||||
@@ -532,7 +532,7 @@ def main():
|
||||
old_password = obj['password'].split('}', 2)[1]
|
||||
if crypt.crypt(password, old_password) != old_password:
|
||||
obj['overridePWHistory'] = module.params['overridePWHistory']
|
||||
obj['overridePWLength'] = module.params['overridePWLength']
|
||||
obj['overridePWLength'] = module.params['overridePWLength']
|
||||
obj['password'] = password
|
||||
|
||||
diff = obj.diff()
|
||||
|
||||
Reference in New Issue
Block a user