X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1416b0952adc0bfee85e15d9c86a51c32fcfd003..949abe8b7922c2b8d74b40366f053fdab1a1d214:/doc/install/install-arv-git-httpd.html.textile.liquid?ds=sidebyside
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 7fc332177d..935f20dd69 100644
--- 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
-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.
-git_repo_ssh_base: "git@git.uuid_prefix.your.domain:"
+Clusters:
+ uuid_prefix:
+ Services:
+ GitSSH:
+ ExternalURL: git@git.uuid_prefix.your.domain:
@@ -267,21 +271,28 @@ The arvados-git-httpd package includes configuration files for systemd. If you'
{% 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.
-Client:
- APIHost: uuid_prefix.your.domain
- Insecure: false
-GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell
-GitoliteHome: /var/lib/arvados/git
-Listen: :9001
-RepoRoot: /var/lib/arvados/git/repositories
+Clusters:
+ uuid_prefix:
+ Services:
+ GitHTTP:
+ ExternalURL: https://git.uuid_prefix.your.domain/
+ InternalURLs:
+ "http://localhost:9001": {}
+ Git:
+ GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell
+ GitoliteHome: /var/lib/arvados/git
+ Repositories: /var/lib/arvados/git/repositories
+Make sure to include the trailing slash for @Services.GitHTTP.ExternalURL@.
+
Restart the systemd service to ensure the new configuration is used.
+
~$ sudo systemctl restart arvados-git-httpd
@@ -320,17 +331,6 @@ server {
-h3. Configure the API server to advertise the correct HTTPS URLs
-
-In your API server's @application.yml@ file, add the following entry:
-
-
-git_repo_https_base: https://git.uuid_prefix.your.domain/
-
-
-
-Make sure to include the trailing slash.
-
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
~$ cd /tmp
-/tmp$ git clone --bare https://github.com/curoverse/arvados.git
+/tmp$ git clone --bare https://github.com/arvados/arvados.git
/tmp git --git-dir arvados.git push https://git.uuid_prefix.your.domain/arvados.git '*:*'
@@ -378,7 +378,7 @@ If you did not set up a HTTPS service, you can push to git@git.uuid_prefix
gitserver:~$ sudo -u git -i bash
-git@gitserver:~$ git clone --bare https://github.com/curoverse/arvados.git /tmp/arvados.git
+git@gitserver:~$ git clone --bare https://github.com/arvados/arvados.git /tmp/arvados.git
git@gitserver:~$ cd /tmp/arvados.git
git@gitserver:/tmp/arvados.git$ gitolite push /var/lib/arvados/git/repositories/your_arvados_repo_uuid.git '*:*'