X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/51eaad58e0a135bdf88d4bdcd819d219d75de0df..55aafbb07904ca24390dd47ea960eae7cb2b909a:/services/arv-git-httpd/git_handler.go?ds=sidebyside

diff --git a/services/arv-git-httpd/git_handler.go b/services/arv-git-httpd/git_handler.go
index f8e38e9516..d9b08a995b 100644
--- a/services/arv-git-httpd/git_handler.go
+++ b/services/arv-git-httpd/git_handler.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -17,13 +21,18 @@ type gitHandler struct {
 }
 
 func newGitHandler() http.Handler {
+	const glBypass = "GL_BYPASS_ACCESS_CHECKS"
+	const glHome = "GITOLITE_HTTP_HOME"
 	var env []string
 	path := os.Getenv("PATH")
 	if theConfig.GitoliteHome != "" {
 		env = append(env,
-			"GITOLITE_HTTP_HOME="+theConfig.GitoliteHome,
-			"GL_BYPASS_ACCESS_CHECKS=1")
+			glHome+"="+theConfig.GitoliteHome,
+			glBypass+"=1")
 		path = path + ":" + theConfig.GitoliteHome + "/bin"
+	} else if home, bypass := os.Getenv(glHome), os.Getenv(glBypass); home != "" || bypass != "" {
+		env = append(env, glHome+"="+home, glBypass+"="+bypass)
+		log.Printf("DEPRECATED: Passing through %s and %s environment variables. Use GitoliteHome configuration instead.", glHome, glBypass)
 	}
 	env = append(env,
 		"GIT_PROJECT_ROOT="+theConfig.RepoRoot,