self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-14 10:53:30 +02:00
Code Issues Releases Activity

added bacports and resolved conflicts

Browse Source
This commit is contained in:
Dmytro Makovey 2017-09-22 00:42:37 -07:00
commit 8cf93ab999
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/manage.py
View File

@ -37,6 +37,7 @@ def user(localpart, domain_name, password, hash_scheme=app.config['PASSWORD_SCHE
db.session.add(user) db.session.add(user)
db.session.commit() db.session.commit()
@manager.command @manager.command
def user_import(localpart, domain_name, password_hash, hash_scheme=app.config['PASSWORD_SCHEME']): def user_import(localpart, domain_name, password_hash, hash_scheme=app.config['PASSWORD_SCHEME']):
""" Import a user along with password hash. Available hashes: """ Import a user along with password hash. Available hashes:
@ -59,7 +60,7 @@ def user_import(localpart, domain_name, password_hash, hash_scheme=app.config['P
db.session.commit() db.session.commit()
@manager.command @manager.command
def config_update(delete_objects=False): def config_update(verbose=False, delete_objects=False):
"""sync configuration with data from YAML-formatted stdin""" """sync configuration with data from YAML-formatted stdin"""
import yaml, sys import yaml, sys
new_config=yaml.load(sys.stdin) new_config=yaml.load(sys.stdin)
@ -67,6 +68,8 @@ def config_update(delete_objects=False):
users=new_config['users'] users=new_config['users']
tracked_users=set() tracked_users=set()
for user_config in users: for user_config in users:
if verbose:
print(str(user_config))
localpart=user_config['localpart'] localpart=user_config['localpart']
domain_name=user_config['domain'] domain_name=user_config['domain']
password_hash=user_config['password_hash'] password_hash=user_config['password_hash']
@ -90,9 +93,15 @@ def config_update(delete_objects=False):
aliases=new_config['aliases'] aliases=new_config['aliases']
tracked_aliases=set() tracked_aliases=set()
for alias_config in aliases: for alias_config in aliases:
if verbose:
print(str(alias_config))
localpart=alias_config['localpart'] localpart=alias_config['localpart']
domain_name=alias_config['domain'] domain_name=alias_config['domain']
destination=alias_config['destination'] pre_destination=alias_config['destination']
if type(pre_destination) == type(""):
destination = pre_destination.split(',')
else:
destination = pre_destination
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
email='{0}@{1}'.format(localpart,domain_name) email='{0}@{1}'.format(localpart,domain_name)
if not domain: if not domain:
@ -104,11 +113,11 @@ def config_update(delete_objects=False):
alias = models.Alias( alias = models.Alias(
localpart=localpart, localpart=localpart,
domain=domain, domain=domain,
destination=destination.split(','), destination=destination,
email=email email=email
) )
else: else:
alias.destination = destination.split(',') alias.destination = destination
db.session.add(alias) db.session.add(alias)
if delete_objects: if delete_objects:

3
dovecot/conf/dovecot.conf
View File

@ -65,7 +65,8 @@ ssl_dh_parameters_length = 2048
# TLS hardening is based on the following documentation: # TLS hardening is based on the following documentation:
# https://bettercrypto.org/static/applied-crypto-hardening.pdf # https://bettercrypto.org/static/applied-crypto-hardening.pdf
ssl_protocols=!SSLv3 !SSLv2 ssl_protocols=!SSLv3 !SSLv2
ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA # ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA
ssl_cipher_list = EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:EDH+aRSA:!RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS
ssl_prefer_server_ciphers = yes ssl_prefer_server_ciphers = yes
ssl_options = no_compression ssl_options = no_compression

0
nginx/extra.d/.keep Normal file
View File

0
nginx/http.d/.keep Normal file
View File