From 428d423846a534b7f501d8cfdbfaecadb20a8eac Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 20 Apr 2022 20:39:43 +0300 Subject: [PATCH] Added IgnoreURLCertErrors parameter for web-service --- Dockerfiles/web-service/alpine/README.md | 1 + Dockerfiles/web-service/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/web-service/centos/README.md | 1 + Dockerfiles/web-service/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/web-service/ol/README.md | 1 + Dockerfiles/web-service/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/web-service/rhel/README.md | 1 + Dockerfiles/web-service/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/web-service/ubuntu/README.md | 1 + Dockerfiles/web-service/ubuntu/docker-entrypoint.sh | 2 ++ env_vars/.env_web_service | 1 + 11 files changed, 16 insertions(+) diff --git a/Dockerfiles/web-service/alpine/README.md b/Dockerfiles/web-service/alpine/README.md index a0e2a2821..83520d4b9 100644 --- a/Dockerfiles/web-service/alpine/README.md +++ b/Dockerfiles/web-service/alpine/README.md @@ -91,6 +91,7 @@ ZBX_TLSACCEPT=unencrypted ZBX_TLSCAFILE= ZBX_TLSCERTFILE= ZBX_TLSKEYFILE= +ZBX_IGNOREURLCERTERRORS=0 ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/web-service/alpine/docker-entrypoint.sh b/Dockerfiles/web-service/alpine/docker-entrypoint.sh index 81df4a689..f9a2879bc 100755 --- a/Dockerfiles/web-service/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-service/alpine/docker-entrypoint.sh @@ -105,6 +105,8 @@ prepare_zbx_web_service_config() { update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" + + update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}" } prepare_web_service() { diff --git a/Dockerfiles/web-service/centos/README.md b/Dockerfiles/web-service/centos/README.md index a0e2a2821..83520d4b9 100644 --- a/Dockerfiles/web-service/centos/README.md +++ b/Dockerfiles/web-service/centos/README.md @@ -91,6 +91,7 @@ ZBX_TLSACCEPT=unencrypted ZBX_TLSCAFILE= ZBX_TLSCERTFILE= ZBX_TLSKEYFILE= +ZBX_IGNOREURLCERTERRORS=0 ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/web-service/centos/docker-entrypoint.sh b/Dockerfiles/web-service/centos/docker-entrypoint.sh index 81df4a689..f9a2879bc 100755 --- a/Dockerfiles/web-service/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-service/centos/docker-entrypoint.sh @@ -105,6 +105,8 @@ prepare_zbx_web_service_config() { update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" + + update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}" } prepare_web_service() { diff --git a/Dockerfiles/web-service/ol/README.md b/Dockerfiles/web-service/ol/README.md index a0e2a2821..83520d4b9 100644 --- a/Dockerfiles/web-service/ol/README.md +++ b/Dockerfiles/web-service/ol/README.md @@ -91,6 +91,7 @@ ZBX_TLSACCEPT=unencrypted ZBX_TLSCAFILE= ZBX_TLSCERTFILE= ZBX_TLSKEYFILE= +ZBX_IGNOREURLCERTERRORS=0 ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/web-service/ol/docker-entrypoint.sh b/Dockerfiles/web-service/ol/docker-entrypoint.sh index 81df4a689..f9a2879bc 100755 --- a/Dockerfiles/web-service/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-service/ol/docker-entrypoint.sh @@ -105,6 +105,8 @@ prepare_zbx_web_service_config() { update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" + + update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}" } prepare_web_service() { diff --git a/Dockerfiles/web-service/rhel/README.md b/Dockerfiles/web-service/rhel/README.md index a0e2a2821..83520d4b9 100644 --- a/Dockerfiles/web-service/rhel/README.md +++ b/Dockerfiles/web-service/rhel/README.md @@ -91,6 +91,7 @@ ZBX_TLSACCEPT=unencrypted ZBX_TLSCAFILE= ZBX_TLSCERTFILE= ZBX_TLSKEYFILE= +ZBX_IGNOREURLCERTERRORS=0 ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/web-service/rhel/docker-entrypoint.sh b/Dockerfiles/web-service/rhel/docker-entrypoint.sh index 81df4a689..f9a2879bc 100755 --- a/Dockerfiles/web-service/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-service/rhel/docker-entrypoint.sh @@ -105,6 +105,8 @@ prepare_zbx_web_service_config() { update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" + + update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}" } prepare_web_service() { diff --git a/Dockerfiles/web-service/ubuntu/README.md b/Dockerfiles/web-service/ubuntu/README.md index a0e2a2821..83520d4b9 100644 --- a/Dockerfiles/web-service/ubuntu/README.md +++ b/Dockerfiles/web-service/ubuntu/README.md @@ -91,6 +91,7 @@ ZBX_TLSACCEPT=unencrypted ZBX_TLSCAFILE= ZBX_TLSCERTFILE= ZBX_TLSKEYFILE= +ZBX_IGNOREURLCERTERRORS=0 ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/web-service/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-service/ubuntu/docker-entrypoint.sh index 81df4a689..f9a2879bc 100755 --- a/Dockerfiles/web-service/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-service/ubuntu/docker-entrypoint.sh @@ -105,6 +105,8 @@ prepare_zbx_web_service_config() { update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}" update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}" + + update_config_var $ZBX_CONFIG "IgnoreURLCertErrors" "${ZBX_IGNOREURLCERTERRORS}" } prepare_web_service() { diff --git a/env_vars/.env_web_service b/env_vars/.env_web_service index 1d473f108..5e1d26186 100644 --- a/env_vars/.env_web_service +++ b/env_vars/.env_web_service @@ -7,3 +7,4 @@ ZBX_ALLOWEDIP=zabbix-server # ZBX_TLSCAFILE= # ZBX_TLSCERTFILE= # ZBX_TLSKEYFILE= +# ZBX_IGNOREURLCERTERRORS=0