YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added removal of "/var/mail/<username>" directory when removing user with --purge option.

Browse source
This commit is contained in:
chateau 2018-12-16 22:29:31 +01:00
parent 5338319890
commit 0ed392cec0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/actionsmap/yunohost.yml
View file

@ -148,6 +148,7 @@ user:
extra: extra:
pattern: *pattern_username pattern: *pattern_username
--purge: --purge:
help: Purge user's home and mail directories
action: store_true action: store_true
### user_update() ### user_update()

4
src/yunohost/user.py
View file

@ -256,6 +256,7 @@ def user_delete(operation_logger, auth, username, purge=False):
if auth.update('cn=sftpusers,ou=groups', {'memberUid': memberlist}): if auth.update('cn=sftpusers,ou=groups', {'memberUid': memberlist}):
if purge: if purge:
subprocess.call(['rm', '-rf', '/home/{0}'.format(username)]) subprocess.call(['rm', '-rf', '/home/{0}'.format(username)])
subprocess.call(['rm', '-rf', '/var/mail/{0}'.format(username)])
else: else:
raise MoulinetteError(169, m18n.n('user_deletion_failed')) raise MoulinetteError(169, m18n.n('user_deletion_failed'))
@ -532,6 +533,3 @@ def _hash_user_password(password):
salt = '$6$' + salt + '$' salt = '$6$' + salt + '$'
return '{CRYPT}' + crypt.crypt(str(password), salt) return '{CRYPT}' + crypt.crypt(str(password), salt)