From dde51ffd897115f2f95f173a3fc28d76161eb111 Mon Sep 17 00:00:00 2001 From: dotneft Date: Mon, 24 Oct 2016 04:02:18 -0700 Subject: [PATCH] Fixed shutdown images --- agent/alpine/run_zabbix_component.sh | 2 +- agent/ubuntu/run_zabbix_component.sh | 2 +- java-gateway/alpine/run_zabbix_component.sh | 2 +- java-gateway/ubuntu/run_zabbix_component.sh | 2 +- proxy-mysql/alpine/run_zabbix_component.sh | 2 +- proxy-mysql/ubuntu/run_zabbix_component.sh | 2 +- proxy-sqlite3/alpine/run_zabbix_component.sh | 2 +- proxy-sqlite3/ubuntu/run_zabbix_component.sh | 2 +- server-mysql/alpine/run_zabbix_component.sh | 2 +- server-mysql/ubuntu/run_zabbix_component.sh | 2 +- server-pgsql/alpine/run_zabbix_component.sh | 2 +- server-pgsql/ubuntu/run_zabbix_component.sh | 2 +- web-apache-mysql/alpine/run_zabbix_component.sh | 2 +- web-apache-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-mysql/alpine/run_zabbix_component.sh | 2 +- web-nginx-mysql/ubuntu/run_zabbix_component.sh | 2 +- web-nginx-pgsql/alpine/run_zabbix_component.sh | 2 +- web-nginx-pgsql/ubuntu/run_zabbix_component.sh | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/agent/alpine/run_zabbix_component.sh +++ b/agent/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/agent/ubuntu/run_zabbix_component.sh +++ b/agent/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/java-gateway/alpine/run_zabbix_component.sh +++ b/java-gateway/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/java-gateway/ubuntu/run_zabbix_component.sh +++ b/java-gateway/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-mysql/alpine/run_zabbix_component.sh +++ b/proxy-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-mysql/ubuntu/run_zabbix_component.sh +++ b/proxy-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-sqlite3/alpine/run_zabbix_component.sh +++ b/proxy-sqlite3/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh +++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-mysql/alpine/run_zabbix_component.sh +++ b/server-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-mysql/ubuntu/run_zabbix_component.sh +++ b/server-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-pgsql/alpine/run_zabbix_component.sh +++ b/server-pgsql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/server-pgsql/ubuntu/run_zabbix_component.sh +++ b/server-pgsql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-apache-mysql/alpine/run_zabbix_component.sh +++ b/web-apache-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-apache-mysql/ubuntu/run_zabbix_component.sh +++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-mysql/alpine/run_zabbix_component.sh +++ b/web-nginx-mysql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-pgsql/alpine/run_zabbix_component.sh +++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf ################################################# diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh index b51cfd088..9f855f685 100755 --- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh +++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh @@ -888,6 +888,6 @@ clear_deploy "$zbx_type" echo "########################################################" echo "** Executing supervisord" -/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf #################################################