Don't require user to set YSV_HOST

The original reason for having this required configuration parameter was that
I didn't think to read the hostname off the request. Doing it this way has the
additional benefit of a single server being able to serve a multitude of
hostnames.

Derek helped me realize this by repeating "there should be sane defaults" like
9000 times (maybe over 9000) till I got so tired of trying to make sure that he
understood why I did it that way to begin with that I looked at the problem
from a different perspective and like in a dream the solution came to me.

fixes #10.
This commit is contained in:
sm
2016-02-16 23:22:33 -08:00
parent bb48f82f9e
commit 501631a45a
2 changed files with 5 additions and 12 deletions
+4 -6
View File
@@ -8,10 +8,9 @@ import (
)
// NewServer populates a server, adds the routes, and returns it for use.
func NewServer(sm *http.ServeMux, store Storage, hostname string) *Server {
func NewServer(sm *http.ServeMux, store Storage) *Server {
s := &Server{
storage: store,
hostname: hostname,
storage: store,
}
sm.Handle("/", s)
return s
@@ -19,8 +18,7 @@ func NewServer(sm *http.ServeMux, store Storage, hostname string) *Server {
// Server serves up the http.
type Server struct {
hostname string
storage Storage
storage Storage
}
func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
@@ -45,7 +43,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
http.Error(w, fmt.Sprintf("invalid repository %q", req.URL.Path), http.StatusBadRequest)
return
}
p.path = fmt.Sprintf("%s/%s", s.hostname, strings.Trim(req.URL.Path, "/"))
p.path = fmt.Sprintf("%s/%s", req.Host, strings.Trim(req.URL.Path, "/"))
if !Valid(p.path, s.storage.All()) {
http.Error(w, fmt.Sprintf("invalid path; prefix already taken %q", req.URL.Path), http.StatusConflict)
return