diff --git a/.env_web b/.env_web index 4d9e27016..ad8fae6a3 100644 --- a/.env_web +++ b/.env_web @@ -18,3 +18,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 30e16c3fa..61b086073 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -78,9 +78,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/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /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 891e0980c..30dfd3c59 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -78,9 +78,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 e1ac39a7c..64e2a2fce 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -78,9 +78,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 6b74076ac..a0ded9789 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -65,9 +65,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/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 6161a64be..6410eee02 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -88,9 +88,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 0067d80d3..bb49d9f4a 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -71,9 +71,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/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /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 cbc071ae1..f9820ca56 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -65,9 +65,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 150ccebc4..08e6024b8 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -88,9 +88,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/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 @@ +> "$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"}