diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 79f0ea6b5..49e64ccf3 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -23,6 +23,8 @@ fi ZABBIX_ETC_DIR="/etc/zabbix" # Web interface www-root directory ZABBIX_WWW_ROOT="/usr/share/zabbix" +# Nginx main configuration file +NGINX_CONF_FILE="/etc/nginx/nginx.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' @@ -244,14 +246,23 @@ prepare_zbx_web_config() { if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/nginx/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx_ssl.conf" + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi + + : ${EXPOSE_WEB_SERVER_INFO:="on"} + + [[ "${EXPOSE_WEB_SERVER_INFO}" != "off" ]] && EXPOSE_WEB_SERVER_INFO="on" + + export EXPOSE_WEB_SERVER_INFO=${EXPOSE_WEB_SERVER_INFO} + sed -i \ + -e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \ + "$NGINX_CONF_FILE" } ################################################# diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 79f0ea6b5..49e64ccf3 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -23,6 +23,8 @@ fi ZABBIX_ETC_DIR="/etc/zabbix" # Web interface www-root directory ZABBIX_WWW_ROOT="/usr/share/zabbix" +# Nginx main configuration file +NGINX_CONF_FILE="/etc/nginx/nginx.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' @@ -244,14 +246,23 @@ prepare_zbx_web_config() { if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/nginx/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx_ssl.conf" + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi + + : ${EXPOSE_WEB_SERVER_INFO:="on"} + + [[ "${EXPOSE_WEB_SERVER_INFO}" != "off" ]] && EXPOSE_WEB_SERVER_INFO="on" + + export EXPOSE_WEB_SERVER_INFO=${EXPOSE_WEB_SERVER_INFO} + sed -i \ + -e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \ + "$NGINX_CONF_FILE" } ################################################# diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 12ad7b40e..429e6576e 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -23,6 +23,8 @@ fi ZABBIX_ETC_DIR="/etc/zabbix" # Web interface www-root directory ZABBIX_WWW_ROOT="/usr/share/zabbix" +# Nginx main configuration file +NGINX_CONF_FILE="/etc/nginx/nginx.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' @@ -244,14 +246,23 @@ prepare_zbx_web_config() { if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/nginx/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx.conf" + "$NGINX_CONF_FILE" sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ - "/etc/zabbix/nginx_ssl.conf" + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi + + : ${EXPOSE_WEB_SERVER_INFO:="on"} + + [[ "${EXPOSE_WEB_SERVER_INFO}" != "off" ]] && EXPOSE_WEB_SERVER_INFO="on" + + export EXPOSE_WEB_SERVER_INFO=${EXPOSE_WEB_SERVER_INFO} + sed -i \ + -e "s/{EXPOSE_WEB_SERVER_INFO}/${EXPOSE_WEB_SERVER_INFO}/g" \ + "$NGINX_CONF_FILE" } #################################################