Feature #14712
closed
[git] arv-git-httpd uses cluster config file
Added by Peter Amstutz over 5 years ago. Updated over 4 years ago.
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
Updated by Peter Amstutz over 5 years ago
- Status changed from New to In Progress
Updated by Peter Amstutz over 5 years ago
- Status changed from In Progress to New
Updated by Peter Amstutz over 5 years ago
- Related to Idea #13648: [Epic] Use one cluster configuration file for all components added
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
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
Updated by Lucas Di Pentima over 5 years ago
TODO: Check SSHUserKey's real usage to see if that's an appropriate naming
Updated by Tom Morris over 5 years ago
- Description updated (diff)
- Target version changed from To Be Groomed to Arvados Future Sprints
- Story points set to 2.0
Updated by Tom Morris about 5 years ago
- Assigned To set to Eric Biagiotti
- Target version changed from Arvados Future Sprints to 2019-07-31 Sprint
Updated by Eric Biagiotti about 5 years ago
- Target version changed from 2019-07-31 Sprint to 2019-08-14 Sprint
Updated by Eric Biagiotti about 5 years ago
- Target version changed from 2019-08-14 Sprint to 2019-08-28 Sprint
Updated by Eric Biagiotti about 5 years ago
- Status changed from New to In Progress
Updated by Eric Biagiotti about 5 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.
Updated by Lucas Di Pentima about 5 years ago
Just 2 minor comments:
- At
config.default.ymlline 429, the comment seems to have a missing double. - At the install guide, file
doc/install/install-arv-git-httpd.html.textile.liquidlines 280 & 291, I believe the services’ section should beGitHTTPinstead ofGitHttp.
Other than that it LGTM, thanks!
Updated by Eric Biagiotti about 5 years ago
Fixed in
Lucas Di Pentima wrote:
Just 2 minor comments:
- At
config.default.ymlline 429, the comment seems to have a missing double.- At the install guide, file
doc/install/install-arv-git-httpd.html.textile.liquidlines 280 & 291, I believe the services’ section should beGitHTTPinstead ofGitHttp.Other than that it LGTM, thanks!
Fixed in 3c0e4dc35b5f2fc34e050fef304cdec0cebe51ae. Thanks!
Updated by Eric Biagiotti about 5 years ago
- Status changed from In Progress to Resolved