self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-09-16 09:06:32 +02:00
Code Issues Releases Activity

Use corret host_* variables

Browse Source
This commit is contained in:
Ionut Filip
2019-02-15 16:49:56 +02:00
parent 71d63c6e45
commit f9e3cd3c5d
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/admin/mailu/configuration.py
View File

@@ -55,12 +55,16 @@ DEFAULT_CONFIG = {
'LOG_LEVEL': 'WARNING',
# Host settings
'HOST_IMAP': 'imap',
'HOST_LMTP': 'imap:2525',
'HOST_POP3': 'imap',
'HOST_SMTP': 'smtp',
'HOST_AUTHSMTP': 'smtp',
'HOST_ADMIN': 'admin',
'HOST_ANTISPAM': 'antispam:11334',
'HOST_WEBMAIL': 'webmail',
'HOST_FRONT': 'front',
'HOST_WEBDAV': 'webdav:5232',
'HOST_REDIS': 'redis',
'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'),
'HOST_FRONT': 'front',
'SUBNET': '192.168.203.0/24',
'POD_ADDRESS_RANGE': None
}

6
core/dovecot/start.py
View File

@@ -21,11 +21,11 @@ def start_podop():
])
# Actual startup script
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("HOST_REDIS", "redis"))
os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin"))
os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin"))
if os.environ["WEBMAIL"] != "none":
os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("WEBMAIL_ADDRESS", "webmail"))
os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("HOST_WEBMAIL", "webmail"))
for dovecot_file in glob.glob("/conf/*.conf"):
convert(dovecot_file, os.path.join("/etc/dovecot", os.path.basename(dovecot_file)))

4
core/postfix/start.py
View File

@@ -26,8 +26,8 @@ def start_podop():
])
# Actual startup script
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin"))
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin"))
os.environ["HOST_ANTISPAM"] = resolve(os.environ.get("HOST_ANTISPAM", "antispam:11332"))
os.environ["HOST_LMTP"] = resolve(os.environ.get("HOST_LMTP", "imap:2525"))

2
services/rspamd/start.py
View File

@@ -9,7 +9,7 @@ from mailustart import resolve, convert
log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
# Actual startup script
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
os.environ["HOST_REDIS"] = resolve(os.environ.get("HOST_REDIS", "redis"))
for rspamd_file in glob.glob("/conf/*"):

4
webmails/rainloop/start.py
View File

@@ -9,8 +9,8 @@ from mailustart import resolve, convert
log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
# Actual startup script
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("IMAP_ADDRESS", "imap"))
os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("HOST_IMAP", "imap"))
os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT"))*0.66/1048576))