ensure that mailname contains ubicast.eu or ubicast.tv refs #20817

tests/test_email.py

@@ -65,9 +65,9 @@ def check_relay():
         if not ip:
             ip = conf.get('NETWORK_IP')
         with open('/etc/mailname', 'r') as f:
-            d = f.read()
-            if domain != 'ubicast.tv' and domain not in d:
-                print_red('/etc/mailname does not contain the server domain, emails will probably be treated as spam')
+            d = f.read().strip()
+            if d not in ('ubicast.tv', 'ubicast.eu'):
+                print_red('/etc/mailname does not contain ubicast.eu or ubicast.tv, mails will probably not be received on ubicast mailing lists')
                 return False
             if not check_spf(ip):
                 print_red('ip %s is not in ubicast.eu SPF and emails sent from support@ubicast.eu will be treated as spam' % ip)