From 3c9bf59258350d3713b892b118f0fc1be80be8db Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Fri, 10 May 2019 11:21:37 -0500 Subject: [PATCH 1/2] web/origin-manager: correct indentation of bootstrap import. --- web/origin-manager/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/origin-manager/index.html b/web/origin-manager/index.html index 052fa82d..741a49da 100644 --- a/web/origin-manager/index.html +++ b/web/origin-manager/index.html @@ -9,7 +9,7 @@ - + From 7abcbe9d54f3e27d62c2598878a90b8394437557 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Fri, 10 May 2019 11:22:20 -0500 Subject: [PATCH 2/2] web/origin-manager: handle multi-level domains. Only consider the last two parts (base domain) as parent. --- web/origin-manager/util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/origin-manager/util.js b/web/origin-manager/util.js index 197aab41..010515c5 100644 --- a/web/origin-manager/util.js +++ b/web/origin-manager/util.js @@ -1,10 +1,10 @@ function operator_url() { - var domain_parent = window.location.hostname.split('.').splice(1).join('.'); + var domain_parent = window.location.hostname.split('.').splice(-2).join('.'); var subdomain = domain_parent.endsWith('suse.de') ? 'tortuga' : 'operator'; return 'https://' + subdomain + '.' + domain_parent; } function obs_url() { - var domain_parent = window.location.hostname.split('.').splice(1).join('.'); + var domain_parent = window.location.hostname.split('.').splice(-2).join('.'); return 'https://build.' + domain_parent; }