Merge remote-tracking branch 'upstream/master' into feat-psql-support

This commit is contained in:
Tim Möhlmann
2018-12-31 18:20:39 +02:00
77 changed files with 957 additions and 292 deletions

View File

@@ -56,6 +56,7 @@ DEFAULT_CONFIG = {
'HOST_WEBMAIL': 'webmail',
'HOST_FRONT': 'front',
'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'),
'SUBNET': '192.168.203.0/24',
'POD_ADDRESS_RANGE': None
}