[ARVADOS] updated: 7e773735e9d547381a77baeeb139696dfa66a7a6
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 3 15:51:12 EDT 2015
Summary of changes:
apps/workbench/app/views/layouts/body.html.erb | 2 +-
.../test/controllers/projects_controller_test.rb | 10 +
doc/_includes/_install_git_curl.liquid | 13 +
doc/_includes/_install_ruby_and_bundler.liquid | 9 +-
doc/install/install-api-server.html.textile.liquid | 139 ++++--
.../install-compute-node.html.textile.liquid | 20 +-
doc/install/install-docker.html.textile.liquid | 6 +-
doc/install/install-sso.html.textile.liquid | 283 +++++++-----
.../install-workbench-app.html.textile.liquid | 23 +-
doc/sdk/cli/install.html.textile.liquid | 8 +-
sdk/cli/bin/crunch-job | 13 +-
sdk/python/arvados/commands/arv_copy.py | 6 +-
services/api/app/models/commit.rb | 32 +-
services/api/config/application.default.yml | 486 +++++++++++----------
services/api/config/application.yml.example | 31 +-
.../{database.yml.sample => database.yml.example} | 0
.../initializers/hardcoded_api_tokens.rb.example | 3 -
services/datamanager/datamanager.go | 44 +-
services/datamanager/keep/keep.go | 84 +++-
services/datamanager/keep/keep_test.go | 81 ++++
services/datamanager/summary/pull_list.go | 6 +-
services/datamanager/summary/pull_list_test.go | 81 ++--
services/datamanager/summary/trash_list.go | 60 +++
services/datamanager/summary/trash_list_test.go | 76 ++++
services/keepstore/trash_worker.go | 8 +-
25 files changed, 1033 insertions(+), 491 deletions(-)
create mode 100644 doc/_includes/_install_git_curl.liquid
rename services/api/config/{database.yml.sample => database.yml.example} (100%)
delete mode 100644 services/api/config/initializers/hardcoded_api_tokens.rb.example
create mode 100644 services/datamanager/keep/keep_test.go
create mode 100644 services/datamanager/summary/trash_list.go
create mode 100644 services/datamanager/summary/trash_list_test.go
via 7e773735e9d547381a77baeeb139696dfa66a7a6 (commit)
via 15c86f88f1f5124c082e77dedd0b97c5efc93388 (commit)
via 95135f30f13fe233da5d8713737561f77a97c6b6 (commit)
via 434be0f7e6420fee1b99e78466ee4a4d734734c1 (commit)
via b6f800ae7e474f1ceeb827fc9712296a96514592 (commit)
via b5b88cdaefb4f35b877c3279d6556fae7d62afcf (commit)
via a812a13a6e9854f37ecebccedeb163b8cbe7130e (commit)
via 93655055b823716a4e45abc4f35f6ba06920e11b (commit)
via d44692dedcf0af87f53653afc27154c38a7b72a5 (commit)
via 4d6e05c25c6a5d72afee37f8165b006267b4183d (commit)
via 6988f4d44d2f8f7fc4aa2c381334c44d3133cf31 (commit)
via bb58564d632498a394ee75b07d17f41b724ef824 (commit)
via 71e1b1d62a71ad052487f5e8ecb8f36ae17ca8e1 (commit)
via f3504dc2b40eaa4235092b671ce0bece43732904 (commit)
via 5ef15a740ed578b2c5d3cc4ef28ef38bb1c433af (commit)
via a76d71558daa6b623c00c8e262840fc6dd68119f (commit)
via 620fb9e0a294f8910ae82c9c38df69976f911c08 (commit)
via 43a95731adfcf942fd9ab598c2b8e2c80911de0c (commit)
via 31a61e326aa23228ab88bf83ff5866e8c7ca9d0a (commit)
via 1b8caff3ad598744e4a0379b01fc95ca4838caa0 (commit)
via 61da6612acb822a87fca157fe39757460213473f (commit)
via 1000275df3e0b4207ae60d51d25b96f74bd06c23 (commit)
via 465cb9225cce74600349239a295b1360ce2b0fa6 (commit)
via 800e8ba4da76590c8cbe9801bef49a7ffb30bfbc (commit)
via 70ce2cc8559b74907458797f7fbd8abb6e2c5a23 (commit)
via 449c9871fb265f111251ee89669914652ac7b4c3 (commit)
via 415ecc439212c2a670b1df05c3e8b1a90245243e (commit)
via 8e74a5f22b14f26d33c89dadf42600d417094009 (commit)
via 9b3223e5cbcd1eb89193e8421d430025ddf791d1 (commit)
via 157a17462d308d94c68bcdaa4dab055c0e5ccbe8 (commit)
via 5ac198c8fd7e329b08f344843fa5680add07566c (commit)
via 607c3ded2ab3ad0c04ef2e3520ce1b507774dedb (commit)
via c0893f609643a73950957c0aa228f167579951d7 (commit)
via 50419ea603e697dd53690842a07a279577d1ca68 (commit)
via 91b7b7fd54c4728ac6cf12181efc1fed60157ecb (commit)
via f51b562b9def7f6bc17e0cc52b60ffc2641d40b5 (commit)
via f63e86a3270836ab5e5f1de31e28b686ff809739 (commit)
via 7da85b85af2dd9b22186bfd48190de7b68f75837 (commit)
via 036140f305fc34fdefe0ae393b1011f4c3f840de (commit)
via b0b276ff6121aace3c52ee855752df6852120343 (commit)
via 2578d032288f24988a54ee57708fe71902e4ef92 (commit)
from 97fa1e269cf5d33365d76fcdc6ec3f6734b0f468 (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 7e773735e9d547381a77baeeb139696dfa66a7a6
Merge: 97fa1e2 15c86f8
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Aug 3 15:50:28 2015 -0400
Merge branch 'master' into 6663-git-server
Conflicts:
doc/install/install-api-server.html.textile.liquid
diff --cc doc/install/install-api-server.html.textile.liquid
index f5d5825,3c188e3..16b3236
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@@ -117,26 -147,52 +147,51 @@@ Example @application.yml@
h3. workbench_address
- Fill in the url of your workbench application in @workbench_address@, for example
+ Set @workbench_address@ to the URL of your workbench application after following "Install Workbench.":install-workbench-app.html
+
+ Example @application.yml@:
+
+ <notextile>
+ <pre><code> workbench_address: <span class="userinput">https://workbench.zzzzz.example.com</span></code></pre>
+ </notextile>
+
+ h3. websockets_address
+
+ Set @websockets_address@ to the @wss://@ URL of the API server websocket endpoint after following "Set up Web servers.":#set_up
+
+ Example @application.yml@:
+
+ <notextile>
+ <pre><code> websockets_address: <span class="userinput">wss://ws.zzzzz.example.com</span></code></pre>
+ </notextile>
+
+ h3(#git_repositories_dir). git_repositories_dir
- https://workbench.@uuid_prefix@.your.domain
-The @git_repositories_dir@ setting specifies the directory where user git repositories will be stored. By default this is @/var/lib/arvados/git at .
++The @git_repositories_dir@ setting specifies the directory where user git repositories will be stored.
- h3(#omniauth). sso_app_id, sso_app_secret, sso_provider_url
-Example @application.yml@:
++Some additional git setup will be done on the "next page":install-arv-git-httpd.html. For now, create an empty directory in the default location:
- For @sso_app_id@ and @sso_app_secret@, provide the same @app_id@ and @app_secret@ used in the "Create arvados-server client for Single Sign On (SSO)":install-sso.html#client step.
+ <notextile>
-<pre><code> git_repositories_dir: <span class="userinput">/var/lib/arvados/git</span>
-</code></pre>
-</notextile>
++<pre><code>~$ <span class="userinput">sudo mkdir -p /var/lib/arvados/git/repositories</span>
++</code></pre></notextile>
- For @sso_provider_url@, provide the base URL where your SSO server is installed: just the scheme and host, with no trailing slash.
-Make sure a clone of the arvados repository exists in @git_repositories_dir at .
++Example @application.yml@:
<notextile>
- <pre><code> sso_app_id: arvados-server
- sso_app_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- sso_provider_url: https://sso.example.com
-<pre><code>~$ <span class="userinput">sudo mkdir -p /var/lib/arvados/git</span>
-~$ <span class="userinput">sudo git clone --bare git://git.curoverse.com/arvados.git /var/lib/arvados/git/arvados.git</span>
-</code></pre></notextile>
++<pre><code> git_repositories_dir: <span class="userinput">/var/lib/arvados/git/repositories</span>
+</code></pre>
+</notextile>
- h3. Other options
+ h3(#git_internal_dir). git_internal_dir
+
+ The @git_internal_dir@ setting specifies the location of Arvados' internal git repository. By default this is @/var/lib/arvados/internal.git at . This repository stores git commits that have been used to run Crunch jobs. It should _not_ be a subdirectory of @git_repositories_dir at .
+
+ Example @application.yml@:
- Consult @/var/www/arvados-api/current/config/application.default.yml@ for a full list of configuration options. (But don't edit it. Edit @application.yml@ instead.)
+ <notextile>
+ <pre><code> git_internal_dir: <span class="userinput">/var/lib/arvados/internal.git</span>
+ </code></pre>
+ </notextile>
h2. Prepare the API server deployment
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list