9950: Fix arvados-git-httpd executable path. Update config path to /etc/arvados/git...

diff --git a/services/arv-git-httpd/arv-git-httpd.service b/services/arv-git-httpd/arv-git-httpd.service
index 1182a0eaf9f1a8fd2cf444ab461db7903c88bacf..8aaf6744deee2ee3ede01e55b635062f4fefa1a7 100644 (file)
--- 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
 
 [Service]
 Type=notify

-ExecStart=/usr/bin/arv-git-httpd
+ExecStart=/usr/bin/arvados-git-httpd

 Restart=always
 
 [Install]
 Restart=always
 
 [Install]

diff --git a/services/arv-git-httpd/main.go b/services/arv-git-httpd/main.go
index 26d2914995d54828b85004f79e516ae1d2c4d5a9..dd281366b29ac886365056ad8c2c4e2250a0d739 100644 (file)
--- a/services/arv-git-httpd/main.go
+++ b/services/arv-git-httpd/main.go
@@ -35,7 +35,7 @@ func defaultConfig() *Config {
 }
 
 func init() {
 }
 
 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)
        const deprecated = " (DEPRECATED -- use config file instead)"
        flag.StringVar(&theConfig.Listen, "address", theConfig.Listen,
                "Address to listen on, \"host:port\" or \":port\"."+deprecated)