1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-03-03 14:52:36 +02:00

Merge remote-tracking branch 'upstream/master' into feat-subnet2

This commit is contained in:
Tim Möhlmann 2018-12-07 11:08:28 +02:00
commit f0906073e3
No known key found for this signature in database
GPG Key ID: 8677988D8072E8DE
2 changed files with 3 additions and 3 deletions

View File

@ -245,7 +245,7 @@ mail {
listen 465 ssl;
listen [::]:465 ssl;
protocol smtp;
smtp_auth plain;
smtp_auth plain login;
}
server {

View File

@ -1,4 +1,4 @@
echo "Creating users ..."
docker-compose -f tests/compose/core/docker-compose.yml exec admin python3 manage.py admin admin mailu.io password || exit 1
docker-compose -f tests/compose/core/docker-compose.yml exec admin python3 manage.py user --hash_scheme='SHA512-CRYPT' user mailu.io 'password' || exit 1
docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu admin admin mailu.io password || exit 1
docker-compose -f tests/compose/core/docker-compose.yml exec admin flask mailu user user mailu.io 'password' 'SHA512-CRYPT' || exit 1
echo "Admin and user successfully created!"