Project

General

Profile

Actions
Copy link

Feature #14712

closed

[git] arv-git-httpd uses cluster config file

Added by Peter Amstutz over 5 years ago. Updated over 4 years ago.

Status:
Resolved
Priority:
Normal
Assigned To:
Eric Biagiotti
Category:
-
Target version:
2019-08-28 Sprint
Story points:
2.0
Release:
Arvados 2.0 - Early 2020
Release relationship:
Auto

Description

See GitServer section of https://dev.arvados.org/projects/arvados/wiki/Config_migration_key_mapping for the canonical list of keys.

Does not include the git sync component which is part of the API Server.

Includes building the framework for config loading which knows how manage the fallback hierarchy of new vs old configuration data as well as how to warn on mismatches if both are present.

Subtasks 1 (0 open — 1 closed)

Task #15479: Review 14712-git-httpd-configResolvedEric Biagiotti08/26/2019Actions

Related issues

Related to Arvados - Idea #13648: [Epic] Use one cluster configuration file for all componentsResolvedActions
Actions
Copy link
 #1

Updated by Peter Amstutz over 5 years ago

  • Status changed from New to In Progress
Actions
Copy link
 #2

Updated by Peter Amstutz over 5 years ago

  • Status changed from In Progress to New
Actions
Copy link
 #3

Updated by Peter Amstutz over 5 years ago

  • Related to Idea #13648: [Epic] Use one cluster configuration file for all components added
Actions
Copy link
 #4

Updated by Peter Amstutz over 5 years ago

  • Tracker changed from Bug to Feature
Actions
Copy link
 #5

Updated by Lucas Di Pentima over 5 years ago

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
Actions
Copy link
 #6

Updated by Lucas Di Pentima over 5 years ago

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
Actions
Copy link
 #7

Updated by Lucas Di Pentima over 5 years ago

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

Actions
Copy link
 #8

Updated by Tom Morris about 5 years ago

  • Description updated (diff)
  • Target version changed from To Be Groomed to Arvados Future Sprints
  • Story points set to 2.0
Actions
Copy link
 #9

Updated by Tom Morris almost 5 years ago

  • Assigned To set to Eric Biagiotti
  • Target version changed from Arvados Future Sprints to 2019-07-31 Sprint
Actions
Copy link
 #10

Updated by Eric Biagiotti over 4 years ago

  • Target version changed from 2019-07-31 Sprint to 2019-08-14 Sprint
Actions
Copy link
 #11

Updated by Eric Biagiotti over 4 years ago

  • Target version changed from 2019-08-14 Sprint to 2019-08-28 Sprint
Actions
Copy link
 #12

Updated by Eric Biagiotti over 4 years ago

  • Status changed from New to In Progress
Actions
Copy link
 #13

Updated by Eric Biagiotti over 4 years ago

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.

Actions
Copy link
 #14

Updated by Lucas Di Pentima over 4 years ago

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!

Actions
Copy link
 #15

Updated by Eric Biagiotti over 4 years ago

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!

Actions
Copy link
 #16

Updated by Eric Biagiotti over 4 years ago

  • Status changed from In Progress to Resolved
Actions
Copy link
 #17

Updated by Peter Amstutz over 4 years ago

  • Release set to 22
Actions
Copy link

Also available in: Atom PDF