From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Tue, 27 Aug 2019 14:59:41 +0000 (-0400)
Subject: 14712: Fixes default config and install doc
X-Git-Tag: 2.0.0~214^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3c0e4dc35b5f2fc34e050fef304cdec0cebe51ae

14712: Fixes default config and install doc

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 887fb12b21..c25fdee1dd 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -277,7 +277,7 @@ Edit the cluster config at @/etc/arvados/config.yml@ and set the following value
 <pre><code>Clusters:
   <span class="userinput">uuid_prefix</span>:
     Services:
-      GitHttp:
+      GitHTTP:
         ExternalURL: <span class="userinput">https://git.uuid_prefix.your.domain/</span>
         InternalURLs:
 	  <span class="userinput">"http://localhost:9001": {}</span>
@@ -288,7 +288,7 @@ Edit the cluster config at @/etc/arvados/config.yml@ and set the following value
 </code></pre>
 </notextile>
 
-Make sure to include the trailing slash for @Services.GitHttp.ExternalURL@.
+Make sure to include the trailing slash for @Services.GitHTTP.ExternalURL@.
 
 Restart the systemd service to ensure the new configuration is used.
 
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 3e098a0029..24b2e450eb 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -420,7 +420,7 @@ Clusters:
 
     Git:
       # Path to git or gitolite-shell executable. Each authenticated
-      # request will execute this program with the single argument http-backend"
+      # request will execute this program with the single argument "http-backend"
       GitCommand: /usr/bin/git
 
       # Path to Gitolite's home directory. If a non-empty path is given,
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index d06ed2602a..8a5b4610c2 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -426,7 +426,7 @@ Clusters:
 
     Git:
       # Path to git or gitolite-shell executable. Each authenticated
-      # request will execute this program with the single argument http-backend"
+      # request will execute this program with the single argument "http-backend"
       GitCommand: /usr/bin/git
 
       # Path to Gitolite's home directory. If a non-empty path is given,