Skip to content
Snippets Groups Projects
Commit c19472a2 authored by Stéphane Diemer's avatar Stéphane Diemer
Browse files

Use socket.getfqdn instead of hostname -f in test_email | refs #33810

parent b7f109c5
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,6 @@ sys.path.append(str(Path(__file__).parents[1].resolve()))
# pylint: disable=wrong-import-position
from utilities import logging as lg # noqa: E402
from utilities.commands import exec_cmd # noqa: E402
from utilities.config import load_conf # noqa: E402
from utilities.network import get_ip # noqa: E402
......@@ -81,12 +80,10 @@ def check_relay(relay_host: str, relay_port: str, domain: str) -> tuple:
out = subprocess.getoutput("grep -E '^myorigin' /etc/postfix/main.cf")
myorigin = out.replace("myorigin", "").strip()
# possible origin names
origins = set(
(
domain or None,
exec_cmd("hostname", log_output=False)[1] or None,
exec_cmd("hostname -f", log_output=False)[1] or None,
)
origins = (
domain or None,
socket.gethostname(),
socket.getfqdn(),
)
if myorigin not in origins:
lg.warning('"myorigin" setting does not contain a valid domain')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment