[ARVADOS] updated: 1.3.0-1996-g19332745d
Git user
git at public.arvados.org
Mon Dec 16 20:24:27 UTC 2019
Summary of changes:
.../install-arv-git-httpd.html.textile.liquid | 38 +++++++++++++---------
.../install-dispatch-cloud.html.textile.liquid | 2 +-
doc/install/install-jobs-image.html.textile.liquid | 2 +-
3 files changed, 25 insertions(+), 17 deletions(-)
via 19332745d7d2d56b7583a930289e0559adac93da (commit)
from 386c1a04bc3c9af3bf452df446583ee1c954db0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 19332745d7d2d56b7583a930289e0559adac93da
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Mon Dec 16 15:24:12 2019 -0500
15572: Update gitolite install instructions
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 964f5a25a..0427cae5b 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -78,15 +78,15 @@ git at gitserver:~$ <span class="userinput">rm .ssh/authorized_keys</span>
h2(#gitolite). Install gitolite
-Check "https://github.com/sitaramc/gitolite/tags":https://github.com/sitaramc/gitolite/tags for the latest stable version. This guide was tested with @v3.6.4 at . _Versions below 3.0 are missing some features needed by Arvados, and should not be used._
+Check "https://github.com/sitaramc/gitolite/tags":https://github.com/sitaramc/gitolite/tags for the latest stable version. This guide was tested with @v3.6.11 at . _Versions below 3.0 are missing some features needed by Arvados, and should not be used._
Download and install the version you selected.
<notextile>
-<pre><code># <span class="userinput">su git</span>
+<pre><code>$ <span class="userinput">sudo -u git -i bash</span>
git at gitserver:~$ <span class="userinput">echo 'PATH=$HOME/bin:$PATH' >.profile</span>
git at gitserver:~$ <span class="userinput">. .profile</span>
-git at gitserver:~$ <span class="userinput">git clone --branch <b>v3.6.4</b> https://github.com/sitaramc/gitolite</span>
+git at gitserver:~$ <span class="userinput">git clone --branch <b>v3.6.11</b> https://github.com/sitaramc/gitolite</span>
...
Note: checking out '5d24ae666bfd2fa9093d67c840eb8d686992083f'.
...
@@ -176,6 +176,15 @@ Create a configuration file @/var/www/arvados-api/current/config/arvados-clients
</code></pre>
</notextile>
+<pre>
+$ sudo chown git:git /var/www/arvados-api/current/config/arvados-clients.yml
+$ sudo chmod og-rwx /var/www/arvados-api/current/config/arvados-clients.yml
+</pre>
+
+h3. Test configuration
+
+notextile. <pre><code>$ <span class="userinput">sudo -u git -i bash -c 'cd /var/www/arvados-api/current && bundle exec script/arvados-git-sync.rb production'</span></code></pre>
+
h3. Enable the synchronization script
The API server package includes a script that retrieves the current set of repository names and permissions from the API, writes them to @arvadosaliases.pl@ in a format usable by gitolite, and triggers gitolite hooks which create new empty repositories if needed. This script should run every 2 to 5 minutes.
@@ -194,38 +203,35 @@ Edit the cluster config at @/etc/arvados/config.yml@ .
<notextile>
<pre><code> Services:
GitSSH:
- ExternalURL: <span class="userinput">git at git.ClusterID.example.com:</span>
+ ExternalURL: "<span class="userinput">git at git.ClusterID.example.com</span>"
GitHTTP:
ExternalURL: <span class="userinput">https://git.ClusterID.example.com/</span>
InternalURLs:
- <span class="userinput">"http://git.ClusterID.example.com:9001": {}</span>
+ "http://localhost:9001": {}
Git:
GitCommand: <span class="userinput">/var/lib/arvados/git/gitolite/src/gitolite-shell</span>
GitoliteHome: <span class="userinput">/var/lib/arvados/git</span>
- Repositories: <span class="userinput">/var/lib/arvados/git/repositories</span>
+ Repositories: <span class="userinput">/var/lib/arvados/git/repositories</span>
</code></pre>
</notextile>
-Make sure to include the trailing colon in @Services.GitSSH.ExternalURL at .
-
h2(#update-nginx). Update nginx configuration
Use a text editor to create a new file @/etc/nginx/conf.d/arvados-git.conf@ with the following configuration. Options that need attention are marked with "TODO".
<notextile>
-<pre><code>
-upstream arvados-git-httpd {
+<pre><code>upstream arvados-git-httpd {
server 127.0.0.1:<span class="userinput">9001</span>;
}
server {
- listen <span class="userinput">[your public IP address]</span>:443 ssl;
+ listen *:443 ssl;
server_name git.<span class="userinput">ClusterID.example.com</span>;
proxy_connect_timeout 90s;
proxy_read_timeout 300s;
ssl on;
- ssl_certificate <span class="userinput">/YOUR/PATH/TO/cert.pem</span>;
- ssl_certificate_key <span class="userinput">/YOUR/PATH/TO/cert.key</span>;
+ ssl_certificate <span class="userinput">/TODO/YOUR/PATH/TO/cert.pem</span>;
+ ssl_certificate_key <span class="userinput">/TODO/YOUR/PATH/TO/cert.key</span>;
# The server needs to accept potentially large refpacks from push clients.
client_max_body_size 128m;
@@ -269,13 +275,15 @@ h2(#confirm-working). Confirm working installation
Create 'testrepo' in the Arvados database.
<notextile>
-<pre><code>~$ <span class="userinput">arv --format=uuid repository create --repository '{"name":"testrepo"}'</span>
+<pre><code>~$ <span class="userinput">arv --format=uuid repository create --repository '{"name":"myusername/testrepo"}'</span>
</code></pre></notextile>
The arvados-git-sync cron job will notice the new repository record and create a repository on disk. Because it is on a timer (default 5 minutes) you may have to wait a minute or two for it to show up.
h3. SSH
+Before you do this, go to Workbench and choose *SSH Keys* from the menu, and upload your public key. Arvados uses the public key to identify you when you access the git repo.
+
<notextile>
<pre><code>~$ <span class="userinput">git clone git at git.ClusterID.example.com:username/testrepo.git</span>
</code></pre>
@@ -283,7 +291,7 @@ h3. SSH
h3. HTTP
-Set up git credential helpers as described in "install shell server":install-shell-server.html for the "git push" command to use your API token instead of prompting you for a username and password.
+Set up git credential helpers as described in "install shell server":install-shell-server.html#config-git for the git command to use your API token instead of prompting you for a username and password.
<notextile>
<pre><code>~$ <span class="userinput">git clone https://git.ClusterID.example.com/username/testrepo.git</span>
diff --git a/doc/install/install-dispatch-cloud.html.textile.liquid b/doc/install/install-dispatch-cloud.html.textile.liquid
index dfc25fc67..d62257650 100644
--- a/doc/install/install-dispatch-cloud.html.textile.liquid
+++ b/doc/install/install-dispatch-cloud.html.textile.liquid
@@ -200,7 +200,7 @@ Submit a simple container request:
},
"runtime_constraints": {
"vcpus": 1,
- "ram": 8388608
+ "ram": 1048576
}
}'</span>
</code></pre>
diff --git a/doc/install/install-jobs-image.html.textile.liquid b/doc/install/install-jobs-image.html.textile.liquid
index 15b16faf0..efd8c9649 100644
--- a/doc/install/install-jobs-image.html.textile.liquid
+++ b/doc/install/install-jobs-image.html.textile.liquid
@@ -19,7 +19,7 @@ Here we create a default project for the standard Arvados Docker images, and giv
~$ <span class="userinput">echo "Arvados project uuid is '$project_uuid'"</span>
~$ <span class="userinput">read -rd $'\000' newlink <<EOF; arv link create --link "$newlink"</span>
<span class="userinput">{
- "tail_uuid":"$all_users_group_uuid",
+ "tail_uuid":"${uuid_prefix}-j7d0g-fffffffffffffff",
"head_uuid":"$project_uuid",
"link_class":"permission",
"name":"can_read"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list