Skip to content

Commit

Permalink
Merge pull request #17 from github/nossl
Browse files Browse the repository at this point in the history
Remove https option, it's confusing and can break things
  • Loading branch information
rubyist committed Apr 9, 2015
2 parents 2c2f6ce + 1bb102a commit 2c7078c
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
type Configuration struct {
Listen string `config:"tcp://:8080"`
Host string `config:"localhost:8080"`
Scheme string `config:"https"`
MetaDB string `config:"lfs.db"`
ContentPath string `config:"lfs-content"`
AdminUser string `config:""`
Expand Down
2 changes: 0 additions & 2 deletions harbour_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,6 @@ var (
)

func TestMain(m *testing.M) {
Config.Scheme = "http"

os.Remove("lfs-test.db")

var err error
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
const (
contentMediaType = "application/vnd.git-lfs"
metaMediaType = contentMediaType + "+json"
version = "0.1.1"
version = "0.1.2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type Representation struct {
// ObjectLink builds a URL linking to the object.
func (v *RequestVars) ObjectLink() string {
path := fmt.Sprintf("/%s/%s/objects/%s", v.User, v.Repo, v.Oid)
return fmt.Sprintf("%s://%s%s", Config.Scheme, Config.Host, path)
return fmt.Sprintf("http://%s%s", Config.Host, path)
}

// link provides a structure used to build a hypermedia representation of an HTTP link.
Expand Down

0 comments on commit 2c7078c

Please sign in to comment.