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

lintball

Browse Source
This commit is contained in:
Michael Hobbs
2014-12-18 11:59:04 -08:00
parent 2695d957ac
commit e8b4bd5a89
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/00_dokku-standard/install
View File

@@ -6,7 +6,7 @@ if [[ ! -f "$DOKKU_ROOT/HOSTNAME" ]]; then
fi fi
if [[ ! -f "$DOKKU_ROOT/VHOST" ]]; then if [[ ! -f "$DOKKU_ROOT/VHOST" ]]; then
[[ $(dig +short $(< "$DOKKU_ROOT/HOSTNAME")) ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST" [[ $(dig +short "$(< "$DOKKU_ROOT/HOSTNAME")") ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
fi fi
# temporary hack for https://github.com/progrium/dokku/issues/82 # temporary hack for https://github.com/progrium/dokku/issues/82

2
plugins/nginx-vhosts/commands
View File

@@ -24,7 +24,7 @@ case "$1" in
[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
if [[ ! -n "$NO_VHOST" ]]; then if [[ ! -n "$NO_VHOST" ]]; then
NONSSL_VHOSTS=`cat $VHOST_PATH` NONSSL_VHOSTS=$(cat $VHOST_PATH)
if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then
SSL_INUSE="$SSL" SSL_INUSE="$SSL"
SSL_DIRECTIVES=$(cat <<EOF SSL_DIRECTIVES=$(cat <<EOF