Skip to content

Commit

Permalink
Merge branch 'master' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Jan 13, 2019
2 parents da784b5 + 3134052 commit 37beb49
Show file tree
Hide file tree
Showing 34 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion agent/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion agent/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion agent/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion java-gateway/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion java-gateway/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion java-gateway/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-mysql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-mysql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-mysql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-sqlite3/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-sqlite3/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion proxy-sqlite3/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-mysql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-mysql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-mysql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-pgsql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-pgsql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion server-pgsql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-mysql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-mysql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-mysql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-pgsql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-pgsql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-apache-pgsql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-mysql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-mysql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-mysql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-pgsql/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-pgsql/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion zabbix-appliance/alpine/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion zabbix-appliance/centos/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion zabbix-appliance/rhel/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,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}"

Expand Down
2 changes: 1 addition & 1 deletion zabbix-appliance/ubuntu/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down

0 comments on commit 37beb49

Please sign in to comment.