Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
b7f109c5
Commit
b7f109c5
authored
3 years ago
by
Stéphane Diemer
Browse files
Options
Downloads
Patches
Plain Diff
Use fqdn as default system domain in tester | refs
#33768
parent
9200efa4
No related branches found
Branches containing commit
Tags
mediaserver-9.7.0
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/tester.py
+4
-4
4 additions, 4 deletions
tests/tester.py
with
4 additions
and
4 deletions
tests/tester.py
+
4
−
4
View file @
b7f109c5
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment