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
cff11f99
Commit
cff11f99
authored
4 years ago
by
Nicolas KAROLAK
Browse files
Options
Downloads
Patches
Plain Diff
add fqdn as possible myorigin value
parent
4911006c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test_email.py
+5
-1
5 additions, 1 deletion
tests/test_email.py
with
5 additions
and
1 deletion
tests/test_email.py
+
5
−
1
View file @
cff11f99
...
...
@@ -79,7 +79,11 @@ def check_relay(relay_host: str, relay_port: str, domain: str) -> tuple:
myorigin
=
out
.
replace
(
"
myorigin
"
,
""
).
strip
()
# possible origin names
origins
=
set
(
(
domain
or
None
,
u
.
exec_cmd
(
"
hostname
"
,
log_output
=
False
)[
1
]
or
None
)
(
domain
or
None
,
u
.
exec_cmd
(
"
hostname
"
,
log_output
=
False
)[
1
]
or
None
,
u
.
exec_cmd
(
"
hostname -f
"
,
log_output
=
False
)[
1
]
or
None
,
)
)
if
myorigin
not
in
origins
:
u
.
warning
(
'"
myorigin
"
setting does not contain a valid domain
'
)
...
...
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