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

Fix NO_VHOST check

Browse Source 
It used to check if NO_VHOST is unset or set to the empty string
It now checks if NO_VHOST is set to a non-empty string
This commit is contained in:
Jose Diaz-Gonzalez
2014-11-24 00:52:42 -05:00
parent 6cad7ef8f4
commit 20977fc2a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/nginx-vhosts/post-deploy
View File

@@ -9,11 +9,11 @@ set +e
NO_VHOST=$(dokku config:get $APP NO_VHOST) NO_VHOST=$(dokku config:get $APP NO_VHOST)
set -e set -e
if [[ -z "$NO_VHOST" ]]; then if [[ -n "$NO_VHOST" ]]; then
echo "-----> NO_VHOST config detected" echo "-----> NO_VHOST config detected"
fi fi
if [[ -f "$DOKKU_ROOT/VHOST" && ! -z "$NO_VHOST" ]]; then if [[ -f "$DOKKU_ROOT/VHOST" && ! -n "$NO_VHOST" ]]; then
VHOST=$(< "$DOKKU_ROOT/VHOST") VHOST=$(< "$DOKKU_ROOT/VHOST")
SUBDOMAIN=${APP/%\.${VHOST}/} SUBDOMAIN=${APP/%\.${VHOST}/}
hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST) hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)