extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-10 00:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #117 from zabbix/master

Browse Source 
Master
This commit is contained in:
Alexey Pustovalov
2017-05-26 12:07:55 +03:00
committed by GitHub
parent 7ea19c34fa 38ea9df195
commit f442acf4f3
34 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxy-mysql/alpine/Dockerfile
View File

@ -29,6 +29,7 @@ RUN addgroup zabbix && \
mkdir -p /usr/share/doc/zabbix-proxy-${DB_TYPE} && \
apk update && \
apk add ${APK_FLAGS_PERSISTANT} \
iputils \
supervisor \
bash \
mariadb-client-libs \

4
proxy-mysql/alpine/run_zabbix_component.sh
View File

@ -26,7 +26,7 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
TZ=${TZ:-"Europe/Riga"}
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
# Default directories
# User 'zabbix' home directory
@ -700,7 +700,7 @@ prepare_zbx_web_config() {
update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${TZ}"
update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
else
echo "**** Zabbix related PHP configuration file not found"
fi

4
proxy-mysql/ubuntu/run_zabbix_component.sh
View File

@ -26,7 +26,7 @@ ZBX_SERVER_HOST=${ZBX_SERVER_HOST:-"zabbix-server"}
ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
# Default timezone for web interface
TZ=${TZ:-"Europe/Riga"}
PHP_TZ=${PHP_TZ:-"Europe/Riga"}
# Default directories
# User 'zabbix' home directory
@ -700,7 +700,7 @@ prepare_zbx_web_config() {
update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${TZ}"
update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
else
echo "**** Zabbix related PHP configuration file not found"
fi