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

Use fqdn as default system domain in tester | refs #33768

parent 9200efa4
No related branches found
Tags mediaserver-9.7.0
No related merge requests found
...@@ -460,14 +460,14 @@ class Tester(): ...@@ -460,14 +460,14 @@ class Tester():
recipients = get_conf('EMAIL_ADMINS') or '' recipients = get_conf('EMAIL_ADMINS') or ''
system_domain = get_conf('MS_SERVER_NAME') system_domain = get_conf('MS_SERVER_NAME')
system_type = 'MediaServer' system_type = 'MediaServer'
if system_domain == 'mediaserver': if not system_domain or system_domain == 'mediaserver':
system_domain = get_conf('CM_SERVER_NAME') system_domain = get_conf('CM_SERVER_NAME')
system_type = 'MirisManager' system_type = 'MirisManager'
if system_domain == 'mirismanager': if not system_domain or system_domain == 'mirismanager':
system_domain = get_conf('MONITOR_SERVER_NAME') system_domain = get_conf('MONITOR_SERVER_NAME')
system_type = 'Server' system_type = 'Server'
if system_domain == 'monitor': if not system_domain or system_domain == 'monitor':
system_type = '-' system_domain = fqdn
if '.' in system_domain: if '.' in system_domain:
top_domain = '.'.join(system_domain.split('.')[-2:]) top_domain = '.'.join(system_domain.split('.')[-2:])
elif '.' in fqdn: elif '.' in fqdn:
......
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