From f81a5308aed52ab124745c2190cd52abd148b532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Wed, 31 Mar 2021 16:44:44 -0300 Subject: [PATCH] frontend: make domain optional Making the domain optional allows usage of bare hostnames for the servers (e.g. when they're statically configured) and even IP addresses if someone is so inclined (although presentation might suffer in this case). --- frontend/lgproxy.go | 6 +++++- frontend/main.go | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/lgproxy.go b/frontend/lgproxy.go index bab96d6..1e152db 100644 --- a/frontend/lgproxy.go +++ b/frontend/lgproxy.go @@ -35,7 +35,11 @@ func batchRequest(servers []string, endpoint string, command string) []string { }(i) } else { // Compose URL and send the request - url := "http://" + server + "." + setting.domain + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command) + hostname := server + if setting.domain != "" { + hostname += "." + setting.domain + } + url := "http://" + hostname + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command) go func(url string, i int) { response, err := http.Get(url) if err != nil { diff --git a/frontend/main.go b/frontend/main.go index 9304ba4..651cf67 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -80,8 +80,6 @@ func main() { if *serversPtr == "" { panic("no server set") - } else if *domainPtr == "" { - panic("no base domain set") } setting = settingType{