Skip to content

Allow setting MISP.curl_request_timeout via env var #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
firefart wants to merge 1 commit into from
+9 −2
Closed

Allow setting MISP.curl_request_timeout via env var #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/files/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export ENABLE_BACKGROUND_UPDATES=${ENABLE_BACKGROUND_UPDATES:-false}
export PROXY_ENABLE=${PROXY_ENABLE:-false}
export DEBUG=${DEBUG:-0}
export ENABLE_THEMES=${ENABLE_THEMES:-false}
export CURL_REQUEST_TIMEOUT=${CURL_REQUEST_TIMEOUT:-300}

export FASTCGI_READ_TIMEOUT=${FASTCGI_READ_TIMEOUT:-300s}
export FASTCGI_SEND_TIMEOUT=${FASTCGI_SEND_TIMEOUT:-300s}
Expand Down
5 changes: 4 additions & 1 deletion core/files/etc/misp-docker/optional.envars.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"MISP.enable_themes": {
"default_value": "${ENABLE_THEMES}"
},
"MISP.curl_request_timeout": {
"default_value": "${CURL_REQUEST_TIMEOUT}"
},
"Plugin.Enrichment_services_url": {
"default_value": "${MISP_MODULES_FQDN}"
},
Expand All @@ -14,4 +17,4 @@
"Plugin.Action_services_url": {
"default_value": "${MISP_MODULES_FQDN}"
}
}
}
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ services:
- "ATTACHMENTS_DIR=${ATTACHMENTS_DIR}"
- "TZ=${TZ:-UTC}"
- "ENABLE_THEMES=${ENABLE_THEMES}"
- "CURL_REQUEST_TIMEOUT=${CURL_REQUEST_TIMEOUT}"
# OIDC authentication settings
- "OIDC_ENABLE=${OIDC_ENABLE}"
- "OIDC_PROVIDER_URL=${OIDC_PROVIDER_URL}"
Expand Down Expand Up @@ -357,7 +358,7 @@ services:
- "./custom/expansion/:/custom/expansion/:Z"
- "./custom/export_mod/:/custom/export_mod/:Z"
- "./custom/import_mod/:/custom/import_mod/:Z"
environment:
environment:
- "TZ=${TZ:-UTC}"

misp-guard:
Expand Down
2 changes: 2 additions & 0 deletions template.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ENABLE_BACKGROUND_UPDATES=
ATTACHMENTS_DIR=
# enable UI themes
# ENABLE_THEMES=false
# CURL request timeout
# CURL_REQUEST_TIMEOUT=300

# Setting the timezone (UTC, Europe/Berlin etc.). Default is UTC.
# TZ="UTC"
Expand Down
Loading