Merge pull request #148 from kuba/index.php

Properly route index (fixes #146)
This commit is contained in:
jsha 2015-05-03 13:55:34 -07:00
commit 957fff4f48
1 changed files with 5 additions and 4 deletions

View File

@ -62,14 +62,14 @@ func NewWebFrontEndImpl() WebFrontEndImpl {
} }
func (wfe *WebFrontEndImpl) HandlePaths() { func (wfe *WebFrontEndImpl) HandlePaths() {
http.HandleFunc(wfe.BaseURL+"/", wfe.Index)
wfe.NewReg = wfe.BaseURL + wfe.NewRegPath wfe.NewReg = wfe.BaseURL + wfe.NewRegPath
wfe.RegBase = wfe.BaseURL + wfe.RegPath wfe.RegBase = wfe.BaseURL + wfe.RegPath
wfe.NewAuthz = wfe.BaseURL + wfe.NewAuthzPath wfe.NewAuthz = wfe.BaseURL + wfe.NewAuthzPath
wfe.AuthzBase = wfe.BaseURL + wfe.AuthzPath wfe.AuthzBase = wfe.BaseURL + wfe.AuthzPath
wfe.NewCert = wfe.BaseURL + wfe.NewCertPath wfe.NewCert = wfe.BaseURL + wfe.NewCertPath
wfe.CertBase = wfe.BaseURL + wfe.CertPath wfe.CertBase = wfe.BaseURL + wfe.CertPath
http.HandleFunc("/", wfe.Index)
http.HandleFunc(wfe.NewRegPath, wfe.NewRegistration) http.HandleFunc(wfe.NewRegPath, wfe.NewRegistration)
http.HandleFunc(wfe.NewAuthzPath, wfe.NewAuthorization) http.HandleFunc(wfe.NewAuthzPath, wfe.NewAuthorization)
http.HandleFunc(wfe.NewCertPath, wfe.NewCertificate) http.HandleFunc(wfe.NewCertPath, wfe.NewCertificate)
@ -85,7 +85,7 @@ func (wfe *WebFrontEndImpl) Index(response http.ResponseWriter, request *http.Re
// http://golang.org/pkg/net/http/#example_ServeMux_Handle // http://golang.org/pkg/net/http/#example_ServeMux_Handle
// The "/" pattern matches everything, so we need to check // The "/" pattern matches everything, so we need to check
// that we're at the root here. // that we're at the root here.
if request.URL.Path != wfe.BaseURL+"/" { if request.URL.Path != "/" {
http.NotFound(response, request) http.NotFound(response, request)
return return
} }
@ -98,7 +98,8 @@ func (wfe *WebFrontEndImpl) Index(response http.ResponseWriter, request *http.Re
server implementation. New registration is available at server implementation. New registration is available at
<a href="{{.NewReg}}">{{.NewReg}}</a>. <a href="{{.NewReg}}">{{.NewReg}}</a>.
</body> </body>
</html>`)) </html>
`))
tmpl.Execute(response, wfe) tmpl.Execute(response, wfe)
response.Header().Set("Content-Type", "text/html") response.Header().Set("Content-Type", "text/html")
} }