From 68d57ec546640255f78f3aae5abf8514df0a003a Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Wed, 28 Sep 2016 11:12:11 -0400
Subject: [PATCH] 9950: Fix arvados-git-httpd executable path. Update config
 path to /etc/arvados/git-httpd/.

---
 services/arv-git-httpd/arv-git-httpd.service | 2 +-
 services/arv-git-httpd/main.go               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/arv-git-httpd/arv-git-httpd.service b/services/arv-git-httpd/arv-git-httpd.service
index 1182a0eaf9..8aaf6744de 100644
--- a/services/arv-git-httpd/arv-git-httpd.service
+++ b/services/arv-git-httpd/arv-git-httpd.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 Type=notify
-ExecStart=/usr/bin/arv-git-httpd
+ExecStart=/usr/bin/arvados-git-httpd
 Restart=always
 
 [Install]
diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
index 26d2914995..dd281366b2 100644
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -35,7 +35,7 @@ func defaultConfig() *Config {
 }
 
 func init() {
-	const defaultCfgPath = "/etc/arvados/arv-git-httpd/arv-git-httpd.yml"
+	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)
-- 
2.30.2