github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2519 from tkalus/tk-2474-dup_nginx_server_name

Browse Source 
Fix for #2474
This commit is contained in:
Jose Diaz-Gonzalez
2017-01-13 22:34:17 -07:00
committed by GitHub
parent a8abd40abe eae3d463df
commit e726bb1df8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/nginx-vhosts/functions
View File

@@ -272,7 +272,14 @@ nginx_build_config() {
else else
local SSL_VHOSTS=$(< "$DOKKU_ROOT/HOSTNAME") local SSL_VHOSTS=$(< "$DOKKU_ROOT/HOSTNAME")
fi fi
local SSL_SERVER_NAME=$(echo "$SSL_VHOSTS" | xargs) local SSL_SERVER_NAME
local host
for host in $SSL_VHOSTS; do
# SSL_SERVER_NAME should only contain items not in NOSSL_SERVER_NAME
if [[ ! $NOSSL_SERVER_NAME =~ (^|[[:space:]])$host($|[[:space:]]) ]]; then
SSL_SERVER_NAME="${host}${SSL_SERVER_NAME:+ $SSL_SERVER_NAME}"
fi
done
fi fi
local NGINX_VERSION="$(nginx -v 2>&1 | cut -d'/' -f 2)" local NGINX_VERSION="$(nginx -v 2>&1 | cut -d'/' -f 2)"