Skip to content
Snippets Groups Projects
Verified Commit 2ff3f7ef authored by Nicolas KAROLAK's avatar Nicolas KAROLAK
Browse files

none attr cannot split

parent 1a36cf96
No related branches found
No related tags found
No related merge requests found
...@@ -218,31 +218,31 @@ def main(): ...@@ -218,31 +218,31 @@ def main():
or u.get_ip() or u.get_ip()
or None or None
) )
sender = conf.get("EMAIL_SENDER") or None sender = conf.get("EMAIL_SENDER") or ""
if not sender and Path("/etc/postfix/generic").exists(): if not sender and Path("/etc/postfix/generic").exists():
with open("/etc/postfix/generic") as sender_fo: with open("/etc/postfix/generic") as sender_fo:
sender = sender_fo.readline().split()[-1] sender = sender_fo.readline().split()[-1]
domain = sender.split("@")[-1] or None domain = sender.split("@")[-1] or None
# check that we are not an open relay # check that we are not an open relay
check_listen_warn, check_listen_err = check_listen() check_warn, check_err = check_listen()
warnings += check_listen_warn if check_listen_warn else warnings warnings += check_warn if check_warn else warnings
errors += check_listen_err if check_listen_err else errors errors += check_err if check_err else errors
# check that relayhost is correct # check that relayhost is correct
check_relay_warn, check_relay_err = check_relay(relay, domain) check_warn, check_err = check_relay(relay, domain)
warnings += check_relay_warn if check_relay_warn else warnings warnings += check_warn if check_warn else warnings
errors += check_relay_err if check_relay_err else errors errors += check_err if check_err else errors
# check that we can send emails # check that we can send emails
check_send_warn, check_send_err = check_send(sender) check_warn, check_err = check_send(sender)
warnings += check_send_warn if check_send_warn else warnings warnings += check_warn if check_warn else warnings
errors += check_send_err if check_send_err else errors errors += check_err if check_err else errors
# check that spf record is correct # check that spf record is correct
check_spf_warn, check_spf_err = check_spf(ip_addr, sender, domain) check_warn, check_err = check_spf(ip_addr, sender, domain)
warnings += check_spf_warn if check_spf_warn else warnings warnings += check_warn if check_warn else warnings
errors += check_spf_err if check_spf_err else errors errors += check_err if check_err else errors
if errors: if errors:
exit(1) exit(1)
......
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