From 77b9579de7bb6ebb64eb50efeb5de38fbb94c081 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 22 Jan 2023 17:17:38 +0900 Subject: [PATCH] Fixed SSO cert env variables --- Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 3 +++ 17 files changed, 51 insertions(+) diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index 28a4ebb74..922e02667 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -187,6 +187,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 59ed2fe38..8a4ae52db 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -203,6 +203,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 59ed2fe38..8a4ae52db 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -203,6 +203,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 3b7607fde..6bdba0be4 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -187,6 +187,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 26e748c62..846ac1b30 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -187,6 +187,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index 1e245e9c4..168453230 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -203,6 +203,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index 1e245e9c4..168453230 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -203,6 +203,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 5c01ca4b3..222bdf92d 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -191,6 +191,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index f9615d67d..33b2c8eb6 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 788283c9c..6e7d48e0f 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 788283c9c..6e7d48e0f 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index 7baf4ec2b..af7c288b8 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 6c4033503..b18ad927e 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 0261857d9..a190878fe 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 2be862b4b..b7ebb2844 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 2be862b4b..b7ebb2844 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp" diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index f559b2091..47f674766 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -209,6 +209,9 @@ prepare_zbx_web_config() { export ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"} export ZBX_SSO_SETTINGS=${ZBX_SSO_SETTINGS:-""} + export ZBX_SSO_SP_KEY=${ZBX_SSO_SP_KEY} + export ZBX_SSO_SP_CERT=${ZBX_SSO_SP_CERT} + export ZBX_SSO_IDP_CERT=${ZBX_SSO_IDP_CERT} if [ -n "${ZBX_SESSION_NAME}" ]; then cp "$ZABBIX_WWW_ROOT/include/defines.inc.php" "/tmp/defines.inc.php_tmp"