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

Fix for dokku/dokku#2474

Browse Source 
`SSL_SERVER_NAME` should contain items found in the ssl certs
(E.G. CommonName and AltNames), but not already in the `NOSSL_SERVER_NAME`
list. That will avoid the dups in the `nginx.conf` and kill the warning
initially cited in dokku/dokku#2474
This commit is contained in:
Turtle Kalus
2016-12-04 18:49:25 -08:00
committed by vagrant
parent cd2ae7ea92
commit eae3d463df
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)"