Merge branch 'master' into trunk

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

View File

@ -925,7 +925,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}"