Merge branch 'trunk' of https://github.com/zabbix/zabbix-docker into trunk

This commit is contained in:
Alexey Pustovalov 2021-10-10 00:43:57 +02:00
commit 452ab0b4eb

View File

@ -12,6 +12,7 @@ ZBX_SERVER_NAME=Composed installation
# VAULT_TOKEN=
# ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
# ZBX_HISTORYSTORAGETYPES=['uint', 'dbl', 'str', 'text', 'log'] # Available since 3.4.5
# ZBX_SSO_SETTINGS=[] # Available since 5.0.0
# ENABLE_WEB_ACCESS_LOG=true
# ZBX_MAXEXECUTIONTIME=600
# ZBX_MEMORYLIMIT=128M