Merge pull request #1530 from Flink/fix-nginx-ssl-conf
Fix nginx configuration for SSL
This commit is contained in:
commit
4c1cc38338
1 file changed
+1
-1
@@ -245,8 +245,8 @@ EOF
|
|||||||
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
||||||
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
||||||
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
||||||
|
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
||||||
fi
|
fi
|
||||||
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
|
||||||
if [[ "$(is_app_vhost_enabled $APP)" == "false" ]] || ([[ -z "$NONSSL_VHOSTS" ]] && [[ -z "$SSL_VHOSTS" ]]); then
|
if [[ "$(is_app_vhost_enabled $APP)" == "false" ]] || ([[ -z "$NONSSL_VHOSTS" ]] && [[ -z "$SSL_VHOSTS" ]]); then
|
||||||
sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF
|
sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in new issue
Block a user