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

don't use fully qualified name if a subdomain of $HOME/VHOST

Browse Source
This commit is contained in:
Eugene Ware
2013-07-08 21:12:37 +10:00
parent 3eadb0ae03
commit f4cdc94209
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,13 @@ set -e
APP="$1"; PORT="$2" APP="$1"; PORT="$2"
if [[ -f "$HOME/VHOST" ]]; then if [[ -f "$HOME/VHOST" ]]; then
[[ "$APP" == *.* ]] && hostname="${APP/\//-}" || hostname="${APP/\//-}.$(< "$HOME/VHOST")" VHOST=$(< "$HOME/VHOST")
SUBDOMAIN=${APP/%\.${VHOST}/}
if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
hostname="${APP/\//-}"
else
hostname="${APP/\//-}.$VHOST"
fi
cat<<EOF > $HOME/$APP/nginx.conf cat<<EOF > $HOME/$APP/nginx.conf
upstream $APP { server 127.0.0.1:$PORT; } upstream $APP { server 127.0.0.1:$PORT; }
server { server {