X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e7a865275a832420b9d63c0ab3ebf87eaca57d26..00f65f60e69326839447f431146312481db05f01:/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
index 75645ff472..0000000000
--- a/services/arv-git-httpd/main.go
+++ /dev/null
@@ -1,78 +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
-	GitoliteHome string
-}
-
-var theConfig = defaultConfig()
-
-func defaultConfig() *Config {
-	return &Config{
-		Listen:     ":80",
-		GitCommand: "/usr/bin/git",
-		RepoRoot:   "/var/lib/arvados/git/repositories",
-	}
-}
-
-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)
-	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)
-	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`.")
-	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))
-		}
-	}
-
-	srv := &server{}
-	if err := srv.Start(); err != nil {
-		log.Fatal(err)
-	}
-	if _, err := daemon.SdNotify(false, "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)
-	}
-}