mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +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
@@ -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