Merge pull request #1643 from Flink/fix-no-vhost

Fix generated nginx config when NO_VHOST=1
This commit is contained in:
Jose Diaz-Gonzalez
2015-11-06 00:06:08 -05:00

View File

@@ -254,6 +254,7 @@ EOF
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
fi
if [[ "$(is_app_vhost_enabled $APP)" == "false" ]] || ([[ -z "$NONSSL_VHOSTS" ]] && [[ -z "$SSL_VHOSTS" ]]); then
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF
fi