diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index f1eb0e8fc..b8dbd001b 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -184,6 +184,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 924618b44..fa0bc684e 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -200,6 +200,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 924618b44..fa0bc684e 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -200,6 +200,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 3c7aa8f5d..90c84a37e 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -184,6 +184,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 23fd41220..0e8237d88 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -184,6 +184,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 e6f98bdcb..5fe0f00c6 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -200,6 +200,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 e6f98bdcb..5fe0f00c6 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -200,6 +200,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 47b6365f9..fbb9da549 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -188,6 +188,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 8790332f8..a5d7d3608 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -206,6 +206,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 0b1b6420a..5edf18e58 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -206,6 +206,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 0b1b6420a..5edf18e58 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -206,6 +206,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 4e379215f..68e171434 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -206,6 +206,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 32bd1a225..5513748b9 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -206,6 +206,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 e8bae251c..0c60c8b47 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -206,6 +206,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 f9b620a95..fb87be727 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -206,6 +206,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 f9b620a95..fb87be727 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -206,6 +206,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 593cb3158..acf0b9087 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -206,6 +206,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"