Merge branch 'release/0.5.2' into production
* release/0.5.2: update docs version, add release to changelog add changelog entry change order of LDAP commands and logging to fix log messages
This commit is contained in:
commit
1079b0b1d2
3 changed files with 6 additions and 3 deletions
|
@ -1,6 +1,9 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
* :release:`0.5.2 <2015-01-29>`
|
||||
* :bug:`-` fix minor log message issue
|
||||
|
||||
* :release:`0.5.1 <2015-01-29>`
|
||||
* :bug:`-` reverted Reject handling in ldaptasks
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner'
|
|||
# The short X.Y version.
|
||||
version = '0.5'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.5.1'
|
||||
release = '0.5.2'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
@ -97,6 +97,8 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
|
|||
if password is not None:
|
||||
ldapuser.set_password(password)
|
||||
_LOGGER.info('set password for LDAP user %s', ldapuser.dn)
|
||||
ldapuser.save()
|
||||
_LOGGER.info('LDAP user %s created', ldapuser.dn)
|
||||
if ldapuser.username in ldapgroup.members:
|
||||
_LOGGER.info(
|
||||
'LDAP user %s is already member of LDAP group %s',
|
||||
|
@ -107,8 +109,6 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
|
|||
_LOGGER.info(
|
||||
'LDAP user %s has been added to LDAP group %s',
|
||||
ldapuser.dn, ldapgroup.dn)
|
||||
ldapuser.save()
|
||||
_LOGGER.info('LDAP user %s created', ldapuser.dn)
|
||||
return ldapuser.dn
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue