[ARVADOS] updated: de6dd658e9b1f27f7895337dc20195c0419799be

[Git user]

Summary of changes:
 services/arv-git-httpd/auth_handler.go     | 5 +++++
 services/arv-git-httpd/gitolite_test.go    | 3 ++-
 services/arv-git-httpd/integration_test.go | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

       via  de6dd658e9b1f27f7895337dc20195c0419799be (commit)
      from  e89f1989b5ec963e5cf2930e117d0933c6d70d55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit de6dd658e9b1f27f7895337dc20195c0419799be
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 21 14:34:05 2016 -0400

    9950: Propagate Client.Insecure config to arvadosclient library via ARVADOS_API_HOST_INSECURE env var.

diff --git a/services/arv-git-httpd/auth_handler.go b/services/arv-git-httpd/auth_handler.go
index 3186501..bfdb396 100644
--- a/services/arv-git-httpd/auth_handler.go
+++ b/services/arv-git-httpd/auth_handler.go
@@ -21,6 +21,11 @@ type authHandler struct {
 
 func (h *authHandler) setup() {
 	os.Setenv("ARVADOS_API_HOST", theConfig.Client.APIHost)
+	if theConfig.Client.Insecure {
+		os.Setenv("ARVADOS_API_HOST_INSECURE", "1")
+	} else {
+		os.Setenv("ARVADOS_API_HOST_INSECURE", "")
+	}
 	h.clientPool = arvadosclient.MakeClientPool()
 }
 
diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index d21a814..219eb11 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -44,7 +44,8 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
 	s.tmpRepoRoot = s.gitoliteHome + "/repositories"
 	s.Config = &Config{
 		Client: arvados.Client{
-			APIHost: os.Getenv("ARVADOS_API_HOST"),
+			APIHost:  os.Getenv("ARVADOS_API_HOST"),
+			Insecure: true,
 		},
 		Listen:     ":0",
 		GitCommand: "/usr/share/gitolite3/gitolite-shell",
diff --git a/services/arv-git-httpd/integration_test.go b/services/arv-git-httpd/integration_test.go
index 5ec5ccb..f772b4d 100644
--- a/services/arv-git-httpd/integration_test.go
+++ b/services/arv-git-httpd/integration_test.go
@@ -70,7 +70,8 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
 	if s.Config == nil {
 		s.Config = &Config{
 			Client: arvados.Client{
-				APIHost: os.Getenv("ARVADOS_API_HOST"),
+				APIHost:  os.Getenv("ARVADOS_API_HOST"),
+				Insecure: true,
 			},
 			Listen:     ":0",
 			GitCommand: "/usr/bin/git",

-----------------------------------------------------------------------


hooks/post-receive
--