diff --git a/.env_web b/.env_web index 4732507a9..e93a2e5a0 100644 --- a/.env_web +++ b/.env_web @@ -19,3 +19,6 @@ ZBX_SERVER_NAME=Composed installation # ZBX_SESSION_NAME=zbx_sessionid # Timezone one of: http://php.net/manual/en/timezones.php # PHP_TZ=Europe/Riga +# ZBX_DENY_GUI_ACCESS=false +# ZBX_GUI_ACCESS_IP_RANGE=['127.0.0.1'] +# ZBX_GUI_WARNING_MSG=Zabbix is under maintenance. diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index d77f9ae6b..45b6b3a04 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -79,9 +79,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/modules/ && \ diff --git a/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-apache-mysql/alpine/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +/dev/null' && \ diff --git a/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php b/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-apache-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 4d3e70991..84548e226 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -79,9 +79,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ diff --git a/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-apache-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +/dev/null' && \ diff --git a/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php b/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-apache-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index fffc5a7b1..2162cb022 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -79,9 +79,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 13a391974..b5193069b 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -66,9 +66,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-mysql/centos/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-mysql/rhel/Dockerfile b/web-nginx-mysql/rhel/Dockerfile index fc6b074ae..9979e030b 100644 --- a/web-nginx-mysql/rhel/Dockerfile +++ b/web-nginx-mysql/rhel/Dockerfile @@ -90,9 +90,11 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ diff --git a/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-mysql/rhel/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 110208752..a0ef7d8db 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -89,9 +89,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 3afa26cb4..610990143 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -72,9 +72,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/modules/ && \ diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-pgsql/alpine/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index b6c7af13c..c2596b207 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -66,9 +66,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-pgsql/centos/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index fc74fa605..374d83469 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -89,9 +89,11 @@ RUN set -eux && \ rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php && \ + rm -f conf/maintenance.inc.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ ./locale/make_mo.sh && \ mkdir -p /var/lib/locales/supported.d/ && \ rm -f /var/lib/locales/supported.d/local && \ diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +> "$PHP_CONFIG_FILE" fi + export ZBX_DENY_GUI_ACCESS=${ZBX_DENY_GUI_ACCESS:-"false"} + export ZBX_GUI_ACCESS_IP_RANGE=${ZBX_GUI_ACCESS_IP_RANGE:-"['127.0.0.1']"} + export ZBX_GUI_WARNING_MSG=${ZBX_GUI_WARNING_MSG:-"Zabbix is under maintenance."} + export ZBX_MAXEXECUTIONTIME=${ZBX_MAXEXECUTIONTIME:-"600"} export ZBX_MEMORYLIMIT=${ZBX_MEMORYLIMIT:-"128M"} export ZBX_POSTMAXSIZE=${ZBX_POSTMAXSIZE:-"16M"} diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index fcef8f943..d4b50d919 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -189,10 +189,12 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ rm -f /usr/share/zabbix/conf/zabbix.conf.php && \ + rm -f /usr/share/zabbix/conf/maintenance.inc.php && \ rm -rf /usr/share/zabbix/tests/ && \ cd /usr/share/zabbix/ && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ + ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php b/zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php new file mode 100644 index 000000000..4bd4791e0 --- /dev/null +++ b/zabbix-appliance/rhel/conf/etc/zabbix/web/maintenance.inc.php @@ -0,0 +1,32 @@ +