Skip to content

Commit 6a9d8df

Browse files
author
root
committed
Merge remote-tracking branch 'origin/master' into 3.2
2 parents 0685e09 + 6bde28a commit 6a9d8df

30 files changed

+30
-30
lines changed

‎agent/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎agent/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎agent/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎java-gateway/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎java-gateway/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎java-gateway/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-mysql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-mysql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-mysql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-sqlite3/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-sqlite3/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎proxy-sqlite3/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-mysql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-mysql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-mysql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-pgsql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-pgsql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎server-pgsql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-mysql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-mysql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-mysql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-pgsql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-pgsql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-apache-pgsql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-mysql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-mysql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-mysql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-pgsql/alpine/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-pgsql/centos/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

‎web-nginx-pgsql/ubuntu/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
924924
if [ -f "/usr/sbin/httpd" ]; then
925925
exec /usr/sbin/httpd -D FOREGROUND
926926
elif [ -f "/usr/sbin/apache2ctl" ]; then
927-
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
927+
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
928928
else
929929
echo "Unknown Web-server. Exiting..."
930930
exit 1

0 commit comments

Comments
 (0)