diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md index 4e59532db..e881b7bc5 100644 --- a/Dockerfiles/web-apache-mysql/README.md +++ b/Dockerfiles/web-apache-mysql/README.md @@ -136,6 +136,10 @@ Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Av The variable sets the Access Log directive for Web-server. By default, value corresponds to standard output. +### `HTTP_INDEX_FILE` + +The variable controls default index page. By default, `index.php`. + ### `ZBX_MAXEXECUTIONTIME` The varable is PHP ``max_execution_time`` option. By default, value is `300`. diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf index 2c55ebca2..b32e8167f 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf index 2cffba707..91b8a7dde 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/apache_ssl.conf @@ -7,7 +7,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index baba67347..07d4329b7 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -210,6 +210,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf index 9594762ba..e696330bf 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf index e081fccdb..9b1685c7c 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 83e8bcb8c..e3b589b86 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -226,6 +226,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf index 9594762ba..e696330bf 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf index e081fccdb..9b1685c7c 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 83e8bcb8c..e3b589b86 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -226,6 +226,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf index 2c55ebca2..b32e8167f 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf index 2c956fec1..b60e34bae 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 7643c27ec..f86b4d4b5 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -210,6 +210,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md index 3e6b60492..745fc1c11 100644 --- a/Dockerfiles/web-apache-pgsql/README.md +++ b/Dockerfiles/web-apache-pgsql/README.md @@ -140,6 +140,10 @@ Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Av The variable sets the Access Log directive for Web-server. By default, value corresponds to standard output. +### `HTTP_INDEX_FILE` + +The variable controls default index page. By default, `index.php`. + ### `ZBX_MAXEXECUTIONTIME` The varable is PHP ``max_execution_time`` option. By default, value is `300`. diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf index 2c55ebca2..b32e8167f 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf index 2cffba707..91b8a7dde 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/apache_ssl.conf @@ -7,7 +7,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 846ac1b30..e50dd3995 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -197,6 +197,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf index 9594762ba..e696330bf 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf index e081fccdb..9b1685c7c 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index 168453230..8534c7a7e 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -213,6 +213,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf index 9594762ba..e696330bf 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf index e081fccdb..9b1685c7c 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ Listen 8443 DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index 168453230..8534c7a7e 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -213,6 +213,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf index 2c55ebca2..b32e8167f 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf @@ -1,7 +1,7 @@ DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf index 2c956fec1..b60e34bae 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf @@ -6,7 +6,7 @@ LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so DocumentRoot /usr/share/zabbix/ ServerName zabbix - DirectoryIndex index.php + DirectoryIndex {HTTP_INDEX_FILE} AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 222bdf92d..e07918c7d 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -201,6 +201,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache.conf" + + if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/apache_ssl.conff" + fi + : ${ENABLE_WEB_ACCESS_LOG:="true"} if [ "${ENABLE_WEB_ACCESS_LOG,,}" == "false" ]; then diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md index 22b3cb4ca..6951c025b 100644 --- a/Dockerfiles/web-nginx-mysql/README.md +++ b/Dockerfiles/web-nginx-mysql/README.md @@ -137,6 +137,10 @@ Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Av The variable sets the Access Log directive for Web-server. By default, value corresponds to standard output. +### `HTTP_INDEX_FILE` + +The variable controls default index page. By default, `index.php`. + ### `ZBX_MAXEXECUTIONTIME` The varable is PHP ``max_execution_time`` option. By default, value is `300`. diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index 8cf91a435..e1b653fee 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -237,10 +237,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index f71ce3895..29a9e1af9 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -237,10 +237,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index f71ce3895..29a9e1af9 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -237,10 +237,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index 7463182cb..b0ec7e6f0 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -237,10 +237,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 443c1bf26..b947dc9d1 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -237,10 +237,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md index e69135d0a..5f4de91ec 100644 --- a/Dockerfiles/web-nginx-pgsql/README.md +++ b/Dockerfiles/web-nginx-pgsql/README.md @@ -140,6 +140,10 @@ Use IEEE754 compatible value range for 64-bit Numeric (float) history values. Av The variable sets the Access Log directive for Web-server. By default, value corresponds to standard output. +### `HTTP_INDEX_FILE` + +The variable controls default index page. By default, `index.php`. + ### `ZBX_MAXEXECUTIONTIME` The varable is PHP ``max_execution_time`` option. By default, value is `300`. diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 34be4bc91..5a1bd04fb 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -224,10 +224,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index b7ebb2844..79f0ea6b5 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -224,10 +224,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index b7ebb2844..79f0ea6b5 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -224,10 +224,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf index ebb311efe..f33585b14 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf @@ -3,7 +3,7 @@ server { listen [::]:8080; server_name zabbix; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log notice; @@ -51,7 +51,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -65,7 +64,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 82731827a..73e887479 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -5,7 +5,7 @@ server { server_name zabbix; server_name_in_redirect off; - index index.php; + index {HTTP_INDEX_FILE}; access_log /var/log/nginx/access.log main; error_log /var/log/nginx/error.log error; @@ -70,7 +70,6 @@ server { fastcgi_pass unix:/tmp/php-fpm.sock; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; - fastcgi_index index.php; include fastcgi_params; } @@ -84,7 +83,7 @@ server { try_files $fastcgi_script_name =404; fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_index index.php; + fastcgi_index {HTTP_INDEX_FILE}; fastcgi_param DOCUMENT_ROOT $webroot; fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 47f674766..12ad7b40e 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -224,10 +224,19 @@ prepare_zbx_web_config() { -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx.conf" + : ${HTTP_INDEX_FILE:="index.php"} + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then sed -i \ -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ "$ZABBIX_ETC_DIR/nginx_ssl.conf" + + sed -i \ + -e "s/{HTTP_INDEX_FILE}/${HTTP_INDEX_FILE}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" fi : ${ENABLE_WEB_ACCESS_LOG:="true"} diff --git a/env_vars/.env_web b/env_vars/.env_web index e52884359..f2d3f50bb 100644 --- a/env_vars/.env_web +++ b/env_vars/.env_web @@ -29,6 +29,7 @@ ZBX_SERVER_NAME=Composed installation # ZBX_DENY_GUI_ACCESS=false # ZBX_GUI_ACCESS_IP_RANGE=['127.0.0.1'] # ZBX_GUI_WARNING_MSG=Zabbix is under maintenance. +# HTTP_INDEX_FILE=index.php # PHP_FPM_PM=dynamic # PHP_FPM_PM_MAX_CHILDREN=50