Feature #14712

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

Added by Peter Amstutz 5 months ago. Updated 4 months ago.

Status:
New
Priority:
Normal
Assigned To:
-
Category:
-
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Story points:
2.0

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.


Related issues

Related to Arvados - Story #13648: [Epic] Use one cluster configuration file for all componentsNew

History

#1 Updated by Peter Amstutz 5 months ago

  • Status changed from New to In Progress

#2 Updated by Peter Amstutz 5 months ago

  • Status changed from In Progress to New

#3 Updated by Peter Amstutz 5 months ago

  • Related to Story #13648: [Epic] Use one cluster configuration file for all components added

#4 Updated by Peter Amstutz 5 months ago

  • Tracker changed from Bug to Feature

#5 Updated by Lucas Di Pentima 4 months 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

#6 Updated by Lucas Di Pentima 4 months 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

#7 Updated by Lucas Di Pentima 4 months ago

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

#8 Updated by Tom Morris 4 months ago

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

Also available in: Atom PDF