Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
38b52edd
Verified
Commit
38b52edd
authored
2 months ago
by
Erwan Rouchet
Browse files
Options
Downloads
Patches
Plain Diff
Configurable e-mail sender address
parent
f2dbdd77
Branches
release-1.7.2
Branches containing commit
Tags
1.7.2
Tags containing commit
1 merge request
!2504
Configurable e-mail sender address
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
arkindex/project/config.py
+1
-0
1 addition, 0 deletions
arkindex/project/config.py
arkindex/project/settings.py
+1
-1
1 addition, 1 deletion
arkindex/project/settings.py
arkindex/project/tests/config_samples/override.yaml
+1
-0
1 addition, 0 deletions
arkindex/project/tests/config_samples/override.yaml
with
3 additions
and
1 deletion
arkindex/project/config.py
+
1
−
0
View file @
38b52edd
...
@@ -112,6 +112,7 @@ def get_settings_parser(base_dir):
...
@@ -112,6 +112,7 @@ def get_settings_parser(base_dir):
email_parser
.
add_option
(
"
port
"
,
type
=
int
)
email_parser
.
add_option
(
"
port
"
,
type
=
int
)
email_parser
.
add_option
(
"
user
"
,
type
=
str
)
email_parser
.
add_option
(
"
user
"
,
type
=
str
)
email_parser
.
add_option
(
"
password
"
,
type
=
str
)
email_parser
.
add_option
(
"
password
"
,
type
=
str
)
email_parser
.
add_option
(
"
from_address
"
,
type
=
str
,
default
=
None
)
email_parser
.
add_option
(
"
error_report_recipients
"
,
type
=
str
,
many
=
True
,
default
=
[])
email_parser
.
add_option
(
"
error_report_recipients
"
,
type
=
str
,
many
=
True
,
default
=
[])
export_parser
=
parser
.
add_subparser
(
"
export
"
,
default
=
{})
export_parser
=
parser
.
add_subparser
(
"
export
"
,
default
=
{})
...
...
This diff is collapsed.
Click to expand it.
arkindex/project/settings.py
+
1
−
1
View file @
38b52edd
...
@@ -480,7 +480,7 @@ if conf["email"]:
...
@@ -480,7 +480,7 @@ if conf["email"]:
EMAIL_HOST
=
conf
[
"
email
"
][
"
host
"
]
EMAIL_HOST
=
conf
[
"
email
"
][
"
host
"
]
EMAIL_PORT
=
conf
[
"
email
"
][
"
port
"
]
EMAIL_PORT
=
conf
[
"
email
"
][
"
port
"
]
EMAIL_HOST_USER
=
conf
[
"
email
"
][
"
user
"
]
EMAIL_HOST_USER
=
conf
[
"
email
"
][
"
user
"
]
DEFAULT_FROM_EMAIL
=
SERVER_EMAIL
=
EMAIL_HOST_USER
DEFAULT_FROM_EMAIL
=
SERVER_EMAIL
=
conf
[
"
email
"
][
"
from_address
"
]
or
EMAIL_HOST_USER
EMAIL_HOST_PASSWORD
=
conf
[
"
email
"
][
"
password
"
]
EMAIL_HOST_PASSWORD
=
conf
[
"
email
"
][
"
password
"
]
EMAIL_USE_TLS
=
True
EMAIL_USE_TLS
=
True
else
:
else
:
...
...
This diff is collapsed.
Click to expand it.
arkindex/project/tests/config_samples/override.yaml
+
1
−
0
View file @
38b52edd
...
@@ -39,6 +39,7 @@ database:
...
@@ -39,6 +39,7 @@ database:
email
:
email
:
error_report_recipients
:
error_report_recipients
:
-
noreply@nasa.gov
-
noreply@nasa.gov
from_address
:
None
host
:
smtp.wanadoo.fr
host
:
smtp.wanadoo.fr
password
:
hunter2
password
:
hunter2
port
:
25
port
:
25
...
...
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