[ARVADOS] updated: 10556d8eea7e57dafe1495f8ceb6fae809d033a3
git at public.curoverse.com
git at public.curoverse.com
Tue Aug 4 15:49:43 EDT 2015
Summary of changes:
doc/install/install-api-server.html.textile.liquid | 2 +-
.../install-arv-git-httpd.html.textile.liquid | 32 ++++++++++++----------
2 files changed, 19 insertions(+), 15 deletions(-)
via 10556d8eea7e57dafe1495f8ceb6fae809d033a3 (commit)
via 6fad718eea05f4292d89470b62e067754873e85d (commit)
via 6f883592fd278398f8b5af3d4ff26196469a5050 (commit)
via f7e00eb55fbcc41b8cd1f416344ad4abdb020bc0 (commit)
from 01a76d36f6afcd3bb7c8e224881fe98364a47b85 (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 10556d8eea7e57dafe1495f8ceb6fae809d033a3
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 4 13:38:39 2015 -0400
6663: Fix config/application.yml -> application.yml.
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 2e2ca7c..295fac7 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -72,7 +72,7 @@ On Red Hat-based systems:
h2. Create a "git" user and a storage directory
-Gitolite and some additional scripts will be installed in @/var/lib/arvados/git@, which means hosted repository data will be stored in @/var/lib/arvados/git/repositories at . If you choose to install gitolite in a different location, make sure to update the @git_repositories_dir@ entry in your API server's @config/application.yml@ file accordingly: for example, if you install gitolite at @/data/gitolite@ then your @git_repositories_dir@ will be @/data/gitolite/repositories at .
+Gitolite and some additional scripts will be installed in @/var/lib/arvados/git@, which means hosted repository data will be stored in @/var/lib/arvados/git/repositories at . If you choose to install gitolite in a different location, make sure to update the @git_repositories_dir@ entry in your API server's @application.yml@ file accordingly: for example, if you install gitolite at @/data/gitolite@ then your @git_repositories_dir@ will be @/data/gitolite/repositories at .
A new UNIX account called "git" will own the files. This makes git URLs look familiar to users (<code>git@[...]:username/reponame.git</code>).
@@ -210,7 +210,7 @@ Otherwise, create @/etc/cron.d/arvados-git-sync@ with the following content:
h3. Configure the API server to advertise the correct SSH URLs
-In your API server's @config/application.yml@ file, add the following entry:
+In your API server's @application.yml@ file, add the following entry:
<notextile>
<pre><code>git_repo_ssh_base: git at git.<span class="userinput">uuid_prefix.your.domain</span>:
@@ -332,7 +332,7 @@ server {
h3. Configure the API server to advertise the correct HTTPS URLs
-In your API server's @config/application.yml@ file, add the following entry:
+In your API server's @application.yml@ file, add the following entry:
<notextile>
<pre><code>git_repo_http_base: https://git.<span class="userinput">uuid_prefix.your.domain</span>/
commit 6fad718eea05f4292d89470b62e067754873e85d
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 4 13:37:04 2015 -0400
6663: Finish editing sentence.
diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 5cdfced..ff3a8e2 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -175,7 +175,7 @@ The git server setup process is covered on "its own page":install-arv-git-httpd.
<pre><code>~$ <span class="userinput">sudo mkdir -p /var/lib/arvados/git/repositories</span>
</code></pre></notextile>
-If you intend to store your git repositories are stored in a different location, specify that location in @application.yml at .
+If you intend to store your git repositories in a different location, specify that location in @application.yml at .
Default setting in @application.default.yml@:
commit 6f883592fd278398f8b5af3d4ff26196469a5050
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 4 13:34:35 2015 -0400
6663: Add non-runit-dependent daemon startup script.
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index be85d1c..2e2ca7c 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -291,6 +291,17 @@ EOF</span>
</code></pre>
</notextile>
+If you are using a different daemon supervisor, or if you want to test the daemon in a terminal window, an equivalent shell command to run arvados-git-httpd is:
+
+<notextile>
+<pre><code>sudo -u git \
+ ARVADOS_API_HOST=<span class="userinput">uuid_prefix.your.domain</span> \
+ GITOLITE_HTTP_HOME=/var/lib/arvados/git \
+ PATH="$PATH:/var/lib/arvados/git/bin" \
+ arvados-git-httpd -address=:9001 -git-command="$(which git)" -repo-root=<span class="userinput">/var/lib/arvados/git/repositories</span> 2>&1
+</code></pre>
+</notextile>
+
h3. Set up a reverse proxy to provide SSL service
The arvados-git-httpd service will be accessible from anywhere on the internet, so we recommend using SSL.
commit f7e00eb55fbcc41b8cd1f416344ad4abdb020bc0
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 4 13:19:27 2015 -0400
6663: Remove unneeded nginx config, clarify where config should be added.
diff --git a/doc/install/install-arv-git-httpd.html.textile.liquid b/doc/install/install-arv-git-httpd.html.textile.liquid
index 6f80be8..be85d1c 100644
--- a/doc/install/install-arv-git-httpd.html.textile.liquid
+++ b/doc/install/install-arv-git-httpd.html.textile.liquid
@@ -297,6 +297,8 @@ The arvados-git-httpd service will be accessible from anywhere on the internet,
This is best achieved by putting a reverse proxy with SSL support in front of arvados-git-httpd, running on port 443 and passing requests to @arvados-git-httpd@ on port 9001 (or whichever port you used in your run script).
+Add the following configuration to the @http@ section of your Nginx configuration:
+
<notextile>
<pre><code>
upstream arvados-git-httpd {
@@ -312,15 +314,6 @@ server {
location / {
proxy_pass http://arvados-git-httpd;
- proxy_redirect off;
- proxy_connect_timeout 90s;
- proxy_read_timeout 300s;
-
- proxy_set_header X-Forwarded-Proto https;
- proxy_set_header Host $http_host;
- proxy_set_header X-External-Client $external_client;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
</code></pre>
@@ -337,9 +330,9 @@ In your API server's @config/application.yml@ file, add the following entry:
Make sure to include the trailing slash.
-h2. Restart nginx
+h2. Restart Nginx
-Restart nginx to make the nginx and API server configuration changes take effect.
+Restart Nginx to make the Nginx and API server configuration changes take effect.
<notextile>
<pre><code>gitserver:~$ <span class="userinput">sudo nginx -s reload</span>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list