Merge pull request #28 from github/httpsbugs

Fix a few bugs around using https
git-lfs · May 6, 2015 · 1579b36 · 1579b36
2 parents 6a7a18b + 7aed15f
commit 1579b36
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ NOTE: If using https with a self signed cert also disable cert checking in the c
 		url = "https://localhost:8080/jimdoe/lfsrepo"
 
 	[http]
-		selfverify = false
+		sslfverify = false
 
 ```
 

diff --git a/config.go b/config.go
@@ -19,7 +19,7 @@ type Configuration struct {
 	AdminPass   string `config:""`
 	Cert        string `config:""`
 	Key         string `config:""`
-	Scheme      string `config:""`
+	Scheme      string `config:"http"`
 }
 
 func (c *Configuration) IsHTTPS() bool {

diff --git a/main.go b/main.go
@@ -13,7 +13,7 @@ import (
 const (
 	contentMediaType = "application/vnd.git-lfs"
 	metaMediaType    = contentMediaType + "+json"
-	version          = "0.2.0"
+	version          = "0.2.1"
 )
 
 var (

diff --git a/mgmt-css.rice-box.go b/mgmt-css.rice-box.go
diff --git a/mgmt-templates.rice-box.go b/mgmt-templates.rice-box.go
diff --git a/mgmt/templates/config.tmpl b/mgmt/templates/config.tmpl
@@ -11,4 +11,13 @@
     url = "{{.Config.Scheme}}://{{.Config.Host}}/user/repo"
 </code>
 </pre>
+
+{{if eq .Config.Scheme "https"}}
+<p>Your server is configured to use https. If you're using self signed certificates, or are getting SSL errors, you can add the following to your <code>.gitconfig</code> file:</p>
+<pre>
+<code>[http]
+    sslverify = false
+</code>
+</pre>
+{{end}}
 </div>
-Original file line number
+Diff line change
@@ Expand Up @@
     		url = "https://localhost:8080/jimdoe/lfsrepo"
     	[http]
-    		selfverify = false
+    		sslfverify = false
     ```
@@ Expand Down @@