Changed tester sender email address | refs #33556

ansible/roles/mediaserver/defaults/main.yml

@@ -10,7 +10,6 @@ server_packages:
   - celerity-utils
   - ubicast-mediaserver
 
-server_mail: dev-mediaserver@ubicast.eu
 server_default_email_sender: "noreply@{{ server_hostname }}"
 server_email_sender: "{{ envsetup_email_sender | default(server_default_email_sender, true) }}"
 

ansible/roles/mirismanager/defaults/main.yml

@@ -13,7 +13,6 @@ manager_packages:
   - ubicast-skyreach
 
 manager_testing: false
-manager_mail: dev-mediaserver@ubicast.eu
 manager_hostname: "{{ envsetup_cm_server_name }}"
 manager_default_email_sender: "noreply@{{ manager_hostname }}"
 manager_email_sender: "{{ envsetup_email_sender | default(manager_default_email_sender, true) }}"

tests/tester.py

@@ -469,9 +469,9 @@ class Tester():
         if not hostname:
             print('Failed to get hostname (required to send email).')
             return 1
+        fqdn = socket.getfqdn()
         log_content_encoding = 'utf-8'
-        # Send email
-        sender = 'support@ubicast.eu'
+        # Get sender and recipients
         recipients = get_conf('EMAIL_ADMINS') or ''
         system_domain = get_conf('MS_SERVER_NAME')
         system_type = 'MediaServer'
@@ -483,6 +483,15 @@ class Tester():
                 system_type = 'Server'
                 if system_domain == 'monitor':
                     system_type = '-'
+        if '.' in system_domain:
+            top_domain = '.'.join(system_domain.split('.')[-2:])
+        elif '.' in fqdn:
+            top_domain = '.'.join(fqdn.split('.')[-2:])
+        else:
+            top_domain = system_domain + '.local'
+        sender = hostname + '@' + top_domain
+        print('Sender address: %s' % sender)
+        # Prepare email contant
         if out_of_support:
             system_domain = '[OUT OF SUPPORT] %s' % system_domain
             recipients = recipients.replace('sysadmin@ubicast.eu', '').replace(
@@ -528,7 +537,7 @@ Content-transfer-encoding: %(log_content_encoding)s
             recipients=recipients,
             status=('KO (%s tests failed)' % failures) if failures > 0 else 'OK',
             date=now.strftime('%Y-%m-%d %H:%M:%S'),
-            fqdn=socket.getfqdn(),
+            fqdn=fqdn,
             report=html_report,
             log_name=self.get_log_name(now).replace('.log', '.txt'),
             log_content_encoding=log_content_encoding,
@@ -536,6 +545,7 @@ Content-transfer-encoding: %(log_content_encoding)s
             system_domain=system_domain,
             system_type=system_type,
         )
+        # Send email
         p = subprocess.Popen(
             ['/usr/sbin/sendmail', '-t'],
             stdin=subprocess.PIPE,