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

Merge pull request #4080 from hugopeixoto/fix/app-vhost-usage

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-09-09 21:23:15 -04:00
committed by GitHub
parent 017cfef6a2 d5b2d0d98e
commit 7e9f98b513
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/common/functions
View File

@@ -919,7 +919,7 @@ internal_get_app_urls() {
echo "http://$(<"$DOKKU_ROOT/HOSTNAME"):$p" echo "http://$(<"$DOKKU_ROOT/HOSTNAME"):$p"
done done
else else
echo "$SCHEME://$(<"$DOKKU_ROOT/VHOST")" echo "$SCHEME://$(<"$DOKKU_ROOT/HOSTNAME")"
fi fi
fi fi
} }

17
plugins/domains/functions
View File

@@ -57,10 +57,7 @@ domains_add() {
done done
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
if [[ $( if grep -x --line-regexp --fixed-strings "$DOMAIN" "$APP_VHOST_PATH" 2> /dev/null; then
grep -w -E "^$DOMAIN$" "$APP_VHOST_PATH" >/dev/null 2>&1
echo $?
) -eq 0 ]]; then
dokku_log_info1 "Skipping: $DOMAIN already added to $APP" dokku_log_info1 "Skipping: $DOMAIN already added to $APP"
else else
echo "$DOMAIN" >>"$APP_VHOST_PATH" echo "$DOMAIN" >>"$APP_VHOST_PATH"
@@ -159,13 +156,10 @@ domains_add_global() {
done done
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
if [[ $( if grep -q --line-regexp --fixed-strings "$DOMAIN" "$GLOBAL_VHOST_PATH" 2> /dev/null; then
grep -w -E "^$DOMAIN$" "$GLOBAL_VHOST_PATH" >/dev/null 2>&1 dokku_log_info1 "Skipping $DOMAIN: already added"
echo $?
) -eq 0 ]]; then
dokku_log_info1 "Skipping: $DOMAIN already added"
else else
grep -qxF "$DOMAIN" "$GLOBAL_VHOST_PATH" || echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH" echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
dokku_log_info1 "Added $DOMAIN" dokku_log_info1 "Added $DOMAIN"
fi fi
done done
@@ -221,14 +215,11 @@ get_app_domains() {
verify_app_name "$1" verify_app_name "$1"
local APP=$1 local APP=$1
local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
local GLOBAL_HOSTNAME_PATH="$DOKKU_ROOT/HOSTNAME" local GLOBAL_HOSTNAME_PATH="$DOKKU_ROOT/HOSTNAME"
if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then
if [[ -f "$APP_VHOST_PATH" ]]; then if [[ -f "$APP_VHOST_PATH" ]]; then
cat "$APP_VHOST_PATH" cat "$APP_VHOST_PATH"
elif [[ -f "$GLOBAL_VHOST_PATH" ]]; then
cat "$GLOBAL_VHOST_PATH"
elif [[ -f "$GLOBAL_HOSTNAME_PATH" ]]; then elif [[ -f "$GLOBAL_HOSTNAME_PATH" ]]; then
cat "$GLOBAL_HOSTNAME_PATH" cat "$GLOBAL_HOSTNAME_PATH"
fi fi