extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-25 17:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 3.2

Browse Source
This commit is contained in:
root 2018-02-22 14:37:41 -08:00
commit 6a9d8dfbc7
30 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
agent/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
agent/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
java-gateway/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
java-gateway/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-mysql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-mysql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-pgsql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1

2
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -924,7 +924,7 @@ elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
if [ -f "/usr/sbin/httpd" ]; then
exec /usr/sbin/httpd -D FOREGROUND
elif [ -f "/usr/sbin/apache2ctl" ]; then
exec source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND
exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
else
echo "Unknown Web-server. Exiting..."
exit 1