X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/16421a1aa8d420728b51d7cbb1b006a5613f8697..5de778c73972c736efa6a2f65857e4d30f1db269:/services/arv-git-httpd/main.go

diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
index 47758f6867..98695c9a9d 100644
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -19,13 +19,21 @@ func init() {
 	flag.StringVar(&theConfig.Addr, "address", "0.0.0.0:80",
 		"Address to listen on, \"host:port\".")
 	flag.StringVar(&theConfig.GitCommand, "git-command", "/usr/bin/git",
-		"Path to git executable. Each authenticated request will execute this program with a single argument, \"http-backend\".")
+		"Path to git or gitolite-shell executable. Each authenticated request will execute this program with a single argument, \"http-backend\".")
 	cwd, err := os.Getwd()
 	if err != nil {
 		log.Fatalln("Getwd():", err)
 	}
 	flag.StringVar(&theConfig.Root, "repo-root", cwd,
 		"Path to git repositories.")
+
+	// MakeArvadosClient returns an error if token is unset (even
+	// though we don't need to do anything requiring
+	// authentication yet). We can't do this in newArvadosClient()
+	// just before calling MakeArvadosClient(), though, because
+	// that interferes with the env var needed by "run test
+	// servers".
+	os.Setenv("ARVADOS_API_TOKEN", "xxx")
 }
 
 func main() {
@@ -35,6 +43,7 @@ func main() {
 		log.Fatal(err)
 	}
 	log.Println("Listening at", srv.Addr)
+	log.Println("Repository root", theConfig.Root)
 	if err := srv.Wait(); err != nil {
 		log.Fatal(err)
 	}