From becf797427025dd0c0caef3f218ddfa01428ee5d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 29 May 2023 10:32:00 +0100
Subject: [PATCH] fix: setup url should use MB_SITE_URL if available (#31078)

Fix #26402
---
 src/metabase/core.clj | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index d901126ccf8..e999047a707 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -63,10 +63,11 @@
   []
   (let [hostname  (or (config/config-str :mb-jetty-host) "localhost")
         port      (config/config-int :mb-jetty-port)
-        setup-url (str "http://"
-                       (or hostname "localhost")
-                       (when-not (= 80 port) (str ":" port))
-                       "/setup/")]
+        site-url  (or (public-settings/site-url)
+                      (str "http://"
+                           hostname
+                           (when-not (= 80 port) (str ":" port))))
+        setup-url (str site-url "/setup/")]
     (log/info (u/format-color 'green
                               (str (deferred-trs "Please use the following URL to setup your Metabase installation:")
                                    "\n\n"
-- 
GitLab