gnuviech/gvaldap
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'release/0.5.2' into production

Browse source 
* 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:
Jan Dittberner 2015-01-29 21:51:50 +01:00
commit 1079b0b1d2
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog.rst
View file

@ -1,6 +1,9 @@
Changelog Changelog
========= =========
* :release:`0.5.2 <2015-01-29>`
* :bug:`-` fix minor log message issue
* :release:`0.5.1 <2015-01-29>` * :release:`0.5.1 <2015-01-29>`
* :bug:`-` reverted Reject handling in ldaptasks * :bug:`-` reverted Reject handling in ldaptasks

2
docs/conf.py
View file

@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner'
# The short X.Y version. # The short X.Y version.
version = '0.5' version = '0.5'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

4
gvaldap/ldaptasks/tasks.py
View file

@ -97,6 +97,8 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password):
if password is not None: if password is not None:
ldapuser.set_password(password) ldapuser.set_password(password)
_LOGGER.info('set password for LDAP user %s', ldapuser.dn) _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: if ldapuser.username in ldapgroup.members:
_LOGGER.info( _LOGGER.info(
'LDAP user %s is already member of LDAP group %s', '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( _LOGGER.info(
'LDAP user %s has been added to LDAP group %s', 'LDAP user %s has been added to LDAP group %s',
ldapuser.dn, ldapgroup.dn) ldapuser.dn, ldapgroup.dn)
ldapuser.save()
_LOGGER.info('LDAP user %s created', ldapuser.dn)
return ldapuser.dn return ldapuser.dn