scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-30 01:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

The lookup could fail; ensure we set something

Browse Source 
(cherry picked from commit 1d65529c94)

# Conflicts:
#	core/postfix/start.py
This commit is contained in:
Florent Daigniere
2021-07-18 18:43:20 +02:00
committed by Mergify
parent 980e17ec30
commit 109ce43cfe
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/postfix/start.py
View File

@@ -58,8 +58,15 @@ os.environ["ADMIN_ADDRESS"] = system.get_host_address_from_environment("ADMIN",
os.environ["ANTISPAM_MILTER_ADDRESS"] = system.get_host_address_from_environment("ANTISPAM_MILTER", "antispam:11332")
os.environ["LMTP_ADDRESS"] = system.get_host_address_from_environment("LMTP", "imap:2525")
os.environ["OUTCLEAN"] = os.environ["HOSTNAMES"].split(",")[0]
<<<<<<< HEAD
os.environ["OUTCLEAN_ADDRESS"] = system.resolve_hostname(os.environ["OUTCLEAN"])
>>>>>>> 8bc1d6c0 (Replace PUBLIC_HOSTNAME/IP in Received headers)
=======
try:
os.environ["OUTCLEAN_ADDRESS"] = system.resolve_hostname(os.environ["OUTCLEAN"])
except:
os.environ["OUTCLEAN_ADDRESS"] = "10.10.10.10"
>>>>>>> 1d65529c (The lookup could fail; ensure we set something)
for postfix_file in glob.glob("/conf/*.cf"):
conf.jinja(postfix_file, os.environ, os.path.join("/etc/postfix", os.path.basename(postfix_file)))