Merge branch '15946-collectionfs-deadlock'

[arvados.git] / doc / install / install-arv-git-httpd.html.textile.liquid

diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 7fc332177dcf812a1f44f3f5554d9d8583844952..935f20dd69860a483112575cd84bba2a612ac1b8 100644 (file)
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -212,10 +212,14 @@ Otherwise, create @/etc/cron.d/arvados-git-sync@ with the following content:
 
 h3. Configure the API server to advertise the correct SSH URLs
 
 
 h3. Configure the API server to advertise the correct SSH URLs
 

-In your API server's @application.yml@ file, add the following entry:
+Edit the cluster config at @/etc/arvados/config.yml@ and set @Services.GitSSH.ExternalURL@. Replace @uuid_prefix@ with your cluster id.

 
 <notextile>
 
 <notextile>

-<pre><code>git_repo_ssh_base: "git@git.<span class="userinput">uuid_prefix.your.domain</span>:"
+<pre><code>Clusters:
+  <span class="userinput">uuid_prefix</span>:
+    Services:
+      GitSSH:
+        ExternalURL: <span class="userinput">git@git.uuid_prefix.your.domain:</span>

 </code></pre>
 </notextile>
 
 </code></pre>
 </notextile>
 


@@ -267,21 +271,28 @@ The arvados-git-httpd package includes configuration files for systemd.  If you'
 
 {% include 'notebox_end' %}
 
 
 {% include 'notebox_end' %}
 

-Create the configuration file @/etc/arvados/git-httpd/git-httpd.yml@. Run @arvados-git-httpd -h@ to learn more about configuration entries.
+Edit the cluster config at @/etc/arvados/config.yml@ and set the following values. Replace @uuid_prefix@ with your cluster id.

 
 <notextile>
 
 <notextile>

-<pre><code>Client:
-  APIHost: <b>uuid_prefix.your.domain</b>
-  Insecure: false
-GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell
-GitoliteHome: /var/lib/arvados/git
-Listen: :9001
-RepoRoot: /var/lib/arvados/git/repositories
+<pre><code>Clusters:
+  <span class="userinput">uuid_prefix</span>:
+    Services:
+      GitHTTP:
+        ExternalURL: <span class="userinput">https://git.uuid_prefix.your.domain/</span>
+        InternalURLs:
+         <span class="userinput">"http://localhost:9001": {}</span>
+    Git:
+      GitCommand: <span class="userinput">/var/lib/arvados/git/gitolite/src/gitolite-shell</span>
+      GitoliteHome: <span class="userinput">/var/lib/arvados/git</span>
+      Repositories: <span class="userinput">/var/lib/arvados/git/repositories</span>

 </code></pre>
 </notextile>
 
 </code></pre>
 </notextile>
 

+Make sure to include the trailing slash for @Services.GitHTTP.ExternalURL@.
+

 Restart the systemd service to ensure the new configuration is used.
 
 Restart the systemd service to ensure the new configuration is used.
 

+

 <notextile>
 <pre><code>~$ <span class="userinput">sudo systemctl restart arvados-git-httpd</span>
 </code></pre>
 <notextile>
 <pre><code>~$ <span class="userinput">sudo systemctl restart arvados-git-httpd</span>
 </code></pre>


@@ -320,17 +331,6 @@ server {
 </code></pre>
 </notextile>
 
 </code></pre>
 </notextile>
 

-h3. Configure the API server to advertise the correct HTTPS URLs
-
-In your API server's @application.yml@ file, add the following entry:
-
-<notextile>
-<pre><code>git_repo_https_base: https://git.<span class="userinput">uuid_prefix.your.domain</span>/
-</code></pre>
-</notextile>
-
-Make sure to include the trailing slash.
-

 h2. Restart Nginx
 
 Restart Nginx to make the Nginx and API server configuration changes take effect.
 h2. Restart Nginx
 
 Restart Nginx to make the Nginx and API server configuration changes take effect.


@@ -369,7 +369,7 @@ In a couple of minutes, your arvados-git-sync cron job will create an empty repo
 
 <notextile>
 <pre><code>~$ <span class="userinput">cd /tmp</span>
 
 <notextile>
 <pre><code>~$ <span class="userinput">cd /tmp</span>

-/tmp$ <span class="userinput">git clone --bare https://github.com/curoverse/arvados.git</span>
+/tmp$ <span class="userinput">git clone --bare https://github.com/arvados/arvados.git</span>

 /tmp <span class="userinput">git --git-dir arvados.git push https://git.<b>uuid_prefix.your.domain</b>/arvados.git '*:*'</span>
 </code></pre>
 </notextile>
 /tmp <span class="userinput">git --git-dir arvados.git push https://git.<b>uuid_prefix.your.domain</b>/arvados.git '*:*'</span>
 </code></pre>
 </notextile>


@@ -378,7 +378,7 @@ If you did not set up a HTTPS service, you can push to <code>git@git.uuid_prefix
 
 <notextile>
 <pre><code>gitserver:~$ <span class="userinput">sudo -u git -i bash</span>
 
 <notextile>
 <pre><code>gitserver:~$ <span class="userinput">sudo -u git -i bash</span>

-git@gitserver:~$ <span class="userinput">git clone --bare https://github.com/curoverse/arvados.git /tmp/arvados.git</span>
+git@gitserver:~$ <span class="userinput">git clone --bare https://github.com/arvados/arvados.git /tmp/arvados.git</span>

 git@gitserver:~$ <span class="userinput">cd /tmp/arvados.git</span>
 git@gitserver:/tmp/arvados.git$ <span class="userinput">gitolite push /var/lib/arvados/git/repositories/<b>your_arvados_repo_uuid</b>.git '*:*'</span>
 </code></pre>
 git@gitserver:~$ <span class="userinput">cd /tmp/arvados.git</span>
 git@gitserver:/tmp/arvados.git$ <span class="userinput">gitolite push /var/lib/arvados/git/repositories/<b>your_arvados_repo_uuid</b>.git '*:*'</span>
 </code></pre>