18947: Refactor arv-git-httpd as an arvados-server subcommand.

[arvados.git] / services / arv-git-httpd / main.go

diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
deleted file mode 100644 (file)
index dd28136..0000000
--- a/services/arv-git-httpd/main.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package main
-
-import (
-       "encoding/json"
-       "flag"
-       "log"
-       "os"
-       "regexp"
-
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/config"
-       "github.com/coreos/go-systemd/daemon"
-)
-
-// Server configuration
-type Config struct {
-       Client     arvados.Client
-       Listen     string
-       GitCommand string
-       RepoRoot   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,
-       }
-}
-
-func init() {
-       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)
-       flag.StringVar(&theConfig.GitCommand, "git-command", theConfig.GitCommand,
-               "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)
-
-       cfgPath := flag.String("config", defaultCfgPath, "Configuration file `path`.")
-       flag.Usage = usage
-       flag.Parse()
-
-       err := config.LoadFile(theConfig, *cfgPath)
-       if err != nil {
-               h := os.Getenv("ARVADOS_API_HOST")
-               if h == "" || !os.IsNotExist(err) || *cfgPath != defaultCfgPath {
-                       log.Fatal(err)
-               }
-               log.Print("DEPRECATED: No config file found, but ARVADOS_API_HOST environment variable is set. Please use a config file instead.")
-               theConfig.Client.APIHost = h
-               if regexp.MustCompile("^(?i:1|yes|true)$").MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE")) {
-                       theConfig.Client.Insecure = true
-               }
-               if j, err := json.MarshalIndent(theConfig, "", "    "); err == nil {
-                       log.Print("Current configuration:\n", string(j))
-               }
-       }
-}
-
-func main() {
-       srv := &server{}
-       if err := srv.Start(); err != nil {
-               log.Fatal(err)
-       }
-       if _, err := daemon.SdNotify("READY=1"); err != nil {
-               log.Printf("Error notifying init daemon: %v", err)
-       }
-       log.Println("Listening at", srv.Addr)
-       log.Println("Repository root", theConfig.RepoRoot)
-       if err := srv.Wait(); err != nil {
-               log.Fatal(err)
-       }
-}