Arvados

services/api/script/arvados-git-sync.rb config file: arvados-clients.yml¶

production:
  gitolite_url: /var/lib/arvados/git/repositories/gitolite-admin.git
  gitolite_tmp: /var/lib/arvados/git
  arvados_api_host: uuid_prefix.example.com
  arvados_api_token: "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" 
  arvados_api_host_insecure: false
  gitolite_arvados_git_user_key: "ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver" 

MAPPINGS¶

Repositories:
  Gitolite:
    AdminURL: /var/lib/arvados/git/repositories/gitolite-admin.git
    TmpDir: /var/lib/arvados/git
    SSHUserKey: ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver

arv-git-httpd config file: /etc/arvados/git-httpd/git-httpd.yml¶

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

MAPPINGS¶

Repositories:
  Gitolite:
    HomeDir: /var/lib/arvados/git
    RootDir: /var/lib/arvados/git/repositories
    HTTPAccess: :9001

Corrected version:

Clusters:
  xyzzy:
    SuperuserToken: zzzzzz
    GitServer:
      [...]
      AdminRepoURL: /var/lib/[...]/gitolite-admin.git              # arvados-git-sync.rb/gitolite_url
      SSHUserKey: ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver       # arvados-git-sync.rb/gitolite_arvados_git_user_key
      TmpDir: /var/lib/arvados/git                                 # arvados-git-sync.rb/gitolite_tmp
      GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell # arv-git-httpd/GitCommand
      GitoliteHomeDir: /var/lib/arvados/git                        # arv-git-httpd/GitoliteHome

TODO: Check SSHUserKey's real usage to see if that's an appropriate naming

Latest at 44a871434f648052a410f158fc8e09ec17c11339
Tests at https://ci.curoverse.com/view/Developer/job/developer-run-tests/1489/.

Manually tested using arvbox:
- Created in account in WB, added my ssh key, and ran git clone git@172.17.0.2:arvados.git from my terminal.
- Ran git clone https://172.17.0.2:9000/arvados.git from my terminal. Username is whateverYouWant and the password is the user token.

Just 2 minor comments:

• At config.default.yml line 429, the comment seems to have a missing double.
• At the install guide, file doc/install/install-arv-git-httpd.html.textile.liquid lines 280 & 291, I believe the services’ section should be GitHTTP instead of GitHttp.

Other than that it LGTM, thanks!

Fixed in

Lucas Di Pentima wrote:

Just 2 minor comments:

• At config.default.yml line 429, the comment seems to have a missing double.
• At the install guide, file doc/install/install-arv-git-httpd.html.textile.liquid lines 280 & 291, I believe the services’ section should be GitHTTP instead of GitHttp.

Other than that it LGTM, thanks!

Fixed in 3c0e4dc35b5f2fc34e050fef304cdec0cebe51ae. Thanks!