luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #1713 from hashicorp/b-internal-ui-redirect 

Fixes redirect from / to /ui when internal UI is enabled.
This commit is contained in:
Ryan Breen 2016-02-12 19:26:59 -05:00
parent bf7d0742ed cbdff8296f
commit 73f700a9a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/agent/http.go
View File

@ -363,6 +363,11 @@ func (s *HTTPServer) wrap(handler func(resp http.ResponseWriter, req *http.Reque
return f return f
} }
// Returns true if the UI is enabled.
func (s *HTTPServer) IsUIEnabled() bool {
return s.uiDir != "" || s.agent.config.EnableUi
}
// Renders a simple index page // Renders a simple index page
func (s *HTTPServer) Index(resp http.ResponseWriter, req *http.Request) { func (s *HTTPServer) Index(resp http.ResponseWriter, req *http.Request) {
// Check if this is a non-index path // Check if this is a non-index path
@ -371,8 +376,9 @@ func (s *HTTPServer) Index(resp http.ResponseWriter, req *http.Request) {
return return
} }
// Check if we have no UI configured // Give them something helpful if there's no UI so they at least know
if s.uiDir == "" { // what this server is.
if !s.IsUIEnabled() {
resp.Write([]byte("Consul Agent")) resp.Write([]byte("Consul Agent"))
return return
} }