Skip to content
Snippets Groups Projects
Commit eb4a31ac authored by Ines RUIZ's avatar Ines RUIZ
Browse files

Merge branch '1944-ajouter-pes-viewer-dans-le-no_proxy-du-docker-compose-yml' into '4.0.x'

Resolve "ajouter pes-viewer dans le no_proxy du docker-compose.yml"

See merge request libriciel/pole-plate-formes/pastell/pastell!1309
parents 1e60abb7 72469a5f
No related branches found
Tags 4.0.9 4.0.9-rc.1
No related merge requests found
......@@ -231,7 +231,7 @@ if (!defined("HTTP_PROXY_URL")) {
// Liste de nom d'hôtes séparés pas des virgules qui n'utiliseront pas le proxy
if (!defined("NO_PROXY")) {
define("NO_PROXY", "localhost,127.0.0.1,::1,seda-generator");
define("NO_PROXY", "localhost,127.0.0.1,::1,seda-generator,pes-viewer");
}
if (!defined("LIST_PACK")) {
......
......@@ -63,7 +63,7 @@ services:
UNLOK_JOB_ERROR_AT_STARTUP: ${UNLOK_JOB_ERROR_AT_STARTUP:-false}
NB_JOB_PAR_VERROU: ${NB_JOB_PAR_VERROU:-1}
HTTP_PROXY_URL: ${HTTP_PROXY_URL:-}
NO_PROXY: ${NO_PROXY:-localhost,127.0.0.1,::1,seda-generator}
NO_PROXY: ${NO_PROXY:-localhost,127.0.0.1,::1,seda-generator,pes-viewer}
TOGGLE_CDGFeature: ${TOGGLE_CDGFeature:-false}
TOGGLE_CertificateAuthentication: ${TOGGLE_CertificateAuthentication:-false}
OPENSSL_CIPHER_STRING_SECURITY_LEVEL: ${OPENSSL_CIPHER_STRING_SECURITY_LEVEL:-2}
......
......@@ -75,7 +75,7 @@ define("JOURNAL_MAX_AGE_IN_MONTHS", "${JOURNAL_MAX_AGE_IN_MONTHS:-2}");
define("UNLOK_JOB_ERROR_AT_STARTUP", "${UNLOK_JOB_ERROR_AT_STARTUP:-false}");
define("NB_JOB_PAR_VERROU", "${NB_JOB_PAR_VERROU:-1}");
define("HTTP_PROXY_URL", "${HTTP_PROXY_URL:-}");
define("NO_PROXY", "${NO_PROXY:-localhost,127.0.0.1,::1,seda-generator}");
define("NO_PROXY", "${NO_PROXY:-localhost,127.0.0.1,::1,seda-generator,pes-viewer}");
define("USE_UUID_FOR_DOCUMENT", ${USE_UUID_FOR_DOCUMENT:-false});
......
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