Stop using VHOST when listing app domains and urls
This commit is contained in:
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -215,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
|
||||||
|
|||||||
Reference in New Issue
Block a user