From d5b2d0d98e87448719a8658a78b78fb520bbc5b3 Mon Sep 17 00:00:00 2001
From: Hugo Peixoto <hugo.peixoto@gmail.com>
Date: Sun, 19 Jul 2020 16:29:35 +0100
Subject: [PATCH] Stop using VHOST when listing app domains and urls

---
 plugins/common/functions  | 2 +-
 plugins/domains/functions | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index d377888b1..b1705fdfb 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -919,7 +919,7 @@ internal_get_app_urls() {
         echo "http://$(<"$DOKKU_ROOT/HOSTNAME"):$p"
       done
     else
-      echo "$SCHEME://$(<"$DOKKU_ROOT/VHOST")"
+      echo "$SCHEME://$(<"$DOKKU_ROOT/HOSTNAME")"
     fi
   fi
 }
diff --git a/plugins/domains/functions b/plugins/domains/functions
index 6a4974ab6..5baed3aec 100755
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -215,14 +215,11 @@ get_app_domains() {
   verify_app_name "$1"
   local APP=$1
   local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
-  local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
   local GLOBAL_HOSTNAME_PATH="$DOKKU_ROOT/HOSTNAME"
 
   if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then
     if [[ -f "$APP_VHOST_PATH" ]]; then
       cat "$APP_VHOST_PATH"
-    elif [[ -f "$GLOBAL_VHOST_PATH" ]]; then
-      cat "$GLOBAL_VHOST_PATH"
     elif [[ -f "$GLOBAL_HOSTNAME_PATH" ]]; then
       cat "$GLOBAL_HOSTNAME_PATH"
     fi