X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a5445a2ae553b0723d8579462bcb48855f71a17c..386e1eefaac2021805f73732b10e9f543c221593:/services/arv-git-httpd/main.go

diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
index 26d2914995..79a3eb3f7b 100644
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -14,28 +18,26 @@ import (
 
 // Server configuration
 type Config struct {
-	Client     arvados.Client
-	Listen     string
-	GitCommand string
-	RepoRoot   string
+	Client          arvados.Client
+	Listen          string
+	GitCommand      string
+	RepoRoot        string
+	GitoliteHome    string
+	ManagementToken string
 }
 
 var theConfig = defaultConfig()
 
 func defaultConfig() *Config {
-	cwd, err := os.Getwd()
-	if err != nil {
-		log.Fatalln("Getwd():", err)
-	}
 	return &Config{
 		Listen:     ":80",
 		GitCommand: "/usr/bin/git",
-		RepoRoot:   cwd,
+		RepoRoot:   "/var/lib/arvados/git/repositories",
 	}
 }
 
-func init() {
-	const defaultCfgPath = "/etc/arvados/arv-git-httpd/arv-git-httpd.yml"
+func main() {
+	const defaultCfgPath = "/etc/arvados/git-httpd/git-httpd.yml"
 	const deprecated = " (DEPRECATED -- use config file instead)"
 	flag.StringVar(&theConfig.Listen, "address", theConfig.Listen,
 		"Address to listen on, \"host:port\" or \":port\"."+deprecated)
@@ -43,8 +45,15 @@ func init() {
 		"Path to git or gitolite-shell executable. Each authenticated request will execute this program with a single argument, \"http-backend\"."+deprecated)
 	flag.StringVar(&theConfig.RepoRoot, "repo-root", theConfig.RepoRoot,
 		"Path to git repositories."+deprecated)
+	flag.StringVar(&theConfig.GitoliteHome, "gitolite-home", theConfig.GitoliteHome,
+		"Value for GITOLITE_HTTP_HOME environment variable. If not empty, GL_BYPASS_ACCESS_CHECKS=1 will also be set."+deprecated)
 
 	cfgPath := flag.String("config", defaultCfgPath, "Configuration file `path`.")
+	dumpConfig := flag.Bool("dump-config", false, "write current configuration to stdout and exit (useful for migrating from command line flags to config file)")
+
+	flag.StringVar(&theConfig.ManagementToken, "management-token", theConfig.ManagementToken,
+		"Authorization token to be included in all health check requests.")
+
 	flag.Usage = usage
 	flag.Parse()
 
@@ -63,14 +72,16 @@ func init() {
 			log.Print("Current configuration:\n", string(j))
 		}
 	}
-}
 
-func main() {
+	if *dumpConfig {
+		log.Fatal(config.DumpAndExit(theConfig))
+	}
+
 	srv := &server{}
 	if err := srv.Start(); err != nil {
 		log.Fatal(err)
 	}
-	if _, err := daemon.SdNotify("READY=1"); err != nil {
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
 		log.Printf("Error notifying init daemon: %v", err)
 	}
 	log.Println("Listening at", srv.Addr)