Merge branch 'master' into 4.0

This commit is contained in:
root
2019-01-13 03:22:51 +02:00
34 changed files with 34 additions and 34 deletions

View File

@ -926,7 +926,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "Server"
fi
update_config_var $ZBX_AGENT_CONFIG "ListenPort"
update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"