Skip to content

Commit 2c7078c

Browse files
committed
Merge pull request #17 from github/nossl
Remove https option, it's confusing and can break things
2 parents 2c2f6ce + 1bb102a commit 2c7078c

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

config.go

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
type Configuration struct {
1414
Listen string `config:"tcp://:8080"`
1515
Host string `config:"localhost:8080"`
16-
Scheme string `config:"https"`
1716
MetaDB string `config:"lfs.db"`
1817
ContentPath string `config:"lfs-content"`
1918
AdminUser string `config:""`

harbour_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@ var (
305305
)
306306

307307
func TestMain(m *testing.M) {
308-
Config.Scheme = "http"
309-
310308
os.Remove("lfs-test.db")
311309

312310
var err error

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
const (
1212
contentMediaType = "application/vnd.git-lfs"
1313
metaMediaType = contentMediaType + "+json"
14-
version = "0.1.1"
14+
version = "0.1.2"
1515
)
1616

1717
var (

server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type Representation struct {
4141
// ObjectLink builds a URL linking to the object.
4242
func (v *RequestVars) ObjectLink() string {
4343
path := fmt.Sprintf("/%s/%s/objects/%s", v.User, v.Repo, v.Oid)
44-
return fmt.Sprintf("%s://%s%s", Config.Scheme, Config.Host, path)
44+
return fmt.Sprintf("http://%s%s", Config.Host, path)
4545
}
4646

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

0 commit comments

Comments
 (0)