Merge branch 'master' into trunk

web-nginx-mysql/alpine/Dockerfile

@@ -54,6 +54,7 @@ RUN set -eux && \
             php7-xmlreader \
             php7-xmlwriter \
             supervisor && \
+    rm -f /etc/nginx/conf.d/*.conf && \
     rm -rf /var/cache/apk/*
 
 ARG MAJOR_VERSION=4.4

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

@@ -638,9 +638,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"