docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into feat-reply-startdate

Browse Source
This commit is contained in:
kaiyou
2018-10-16 23:53:43 +02:00
parent 5ada669f43 7c82be904f
commit ed3388ed6e
17 changed files with 144 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/mailu/__init__.py
View File

@@ -57,7 +57,7 @@ default_config = {
'RECAPTCHA_PUBLIC_KEY': '',
'RECAPTCHA_PRIVATE_KEY': '',
# Advanced settings
'PASSWORD_SCHEME': 'SHA512-CRYPT',
'PASSWORD_SCHEME': 'BLF-CRYPT',
# Host settings
'HOST_IMAP': 'imap',
'HOST_POP3': 'imap',

3
core/admin/mailu/models.py
View File

@@ -287,7 +287,8 @@ class User(Base, Email):
self.reply_enddate > now
)
scheme_dict = {'SHA512-CRYPT': "sha512_crypt",
scheme_dict = {'BLF-CRYPT': "bcrypt",
'SHA512-CRYPT': "sha512_crypt",
'SHA256-CRYPT': "sha256_crypt",
'MD5-CRYPT': "md5_crypt",
'CRYPT': "des_crypt"}