[ARVADOS] updated: 1fdb31ed54f690d6a14a55aa7d50559697421fb6

git at public.curoverse.com git at public.curoverse.com
Fri Jul 10 11:02:38 EDT 2015


Summary of changes:
 apps/workbench/Gemfile                             |   2 +-
 apps/workbench/Gemfile.lock                        |  78 ++++++------
 .../app/controllers/projects_controller.rb         |   2 +-
 apps/workbench/app/views/layouts/body.html.erb     |   4 +-
 apps/workbench/config/application.default.yml      |   3 +
 .../test/controllers/projects_controller_test.rb   |  26 ++++
 doc/install/install-api-server.html.textile.liquid |  42 ++++---
 ...l-manual-prerequisites-ruby.html.textile.liquid |  53 ++++++--
 ...nstall-manual-prerequisites.html.textile.liquid |  25 ++--
 .../tutorial-keep-mount.html.textile.liquid        |   2 +-
 sdk/pam/arvados_pam.py                             |  99 +++++++++++++++
 sdk/pam/debian/arvados_pam                         |  10 ++
 sdk/pam/debian/shellinabox                         | 136 +++++++++++++++++++++
 sdk/python/tests/run_test_server.py                |   9 +-
 sdk/python/tests/test_arv_put.py                   |   2 +-
 services/api/Rakefile                              |  31 +++++
 .../arvados/v1/repositories_controller.rb          |  19 ++-
 .../app/controllers/user_sessions_controller.rb    |   4 +-
 .../api/app/views/static/login_failure.html.erb    |   2 +-
 services/api/config/application.default.yml        |   9 ++
 services/api/config/application.yml.example        |   3 +
 services/api/config/database.yml.sample            |   3 +
 services/api/config/initializers/load_config.rb    |  16 +++
 .../api/config/initializers/omniauth.rb.example    |  13 --
 services/api/config/initializers/omniauth_init.rb  |  19 +++
 services/api/db/structure.sql                      |   2 +-
 .../arvados/v1/repositories_controller_test.rb     |  11 ++
 27 files changed, 516 insertions(+), 109 deletions(-)
 create mode 100644 sdk/pam/arvados_pam.py
 create mode 100644 sdk/pam/debian/arvados_pam
 create mode 100644 sdk/pam/debian/shellinabox
 delete mode 100644 services/api/config/initializers/omniauth.rb.example
 create mode 100644 services/api/config/initializers/omniauth_init.rb

       via  1fdb31ed54f690d6a14a55aa7d50559697421fb6 (commit)
       via  6c38124b71b62927e880224f3a4f01874109cb08 (commit)
       via  453cdbc12b93d666995f5d955f174ae8a4d6b378 (commit)
       via  896855457f5966f3130bba4176c1c0b9f160114d (commit)
       via  2fed32a4c6bcc086a90037733052cb572a2f0a37 (commit)
       via  e39a5e062b86e677a1d990066670efb512c7fe72 (commit)
       via  99c4b804af44311d95e0b0ab72521471a1166347 (commit)
       via  3cf223a0d4374e6fc743439826f49adaf29f21cb (commit)
       via  19891e472215cf9e976158beb56ba22b8d581d7b (commit)
       via  3d3f25043f3f270a675391237a2a2a73495e1e37 (commit)
       via  45c2b55b04626ab62d725f280893e270502e6011 (commit)
       via  a5c2ae6bf4687becf0cae82b45362e092c11c8da (commit)
       via  c416e64c8f6a3a1e66daaf8ed2da0b9251df30cb (commit)
       via  c01e6aeda1af59597bfddf046628bb4802f2d671 (commit)
       via  5a9684ac02fb535d1ad5cc80a6390d758415d0d5 (commit)
       via  76e03aef476139403bab1df2ed038761159ceff1 (commit)
       via  2ecf7efbab5ceb082739dcffd98c18bb4b14447e (commit)
       via  9fbb2bbd4e2a0f1d15e1db3f3d606cdedae825a7 (commit)
       via  e56ea5c6c9244d2baaef9a24efc5eaad5bdf290c (commit)
       via  71ba12ca158c39c17187f15c26279ec00d461dc5 (commit)
       via  85de04ad9268e45bad459a606bfabfca4f6fad8c (commit)
       via  158b18f036fc5f3f5848390d7ef53c6493aeb5a9 (commit)
       via  acfbb64831047dcae895e57ceff3d0a834c91bf2 (commit)
       via  5608a875c36101c791e35c474abf5e3900aad071 (commit)
       via  e06ea339d3d0c0f6fad81128b3cab34cdd4bd36f (commit)
       via  734a66939892064fe9c663fd746cb7371c7d84e4 (commit)
       via  3eedcb355e3dfdc4b8006083cfbcf2610b9d895d (commit)
       via  25d4718345b22916d1b865c164437934a2a6cddd (commit)
       via  9df4975aa288c0847d69c25474fe4711ba5b91f3 (commit)
       via  da80f4a198e734313a7991466244083dabd64b00 (commit)
       via  c428f31ab63f8414973848455ab7c44ed4a1d51b (commit)
       via  fdb63be9fde8ea69e78e68f77bb0ab00a79a8d6f (commit)
       via  c0082c57cb7c5e67115e7b03c8c85f74b5b29d0d (commit)
       via  770927dbfa1fb16b3075d1581dc66f4e7a623631 (commit)
       via  57922375aa60a80e5af5c1e5baa0205df9dfdfb1 (commit)
       via  87e9c0e26ff55582a993a8e11902e8657647f59a (commit)
      from  fa92bc75955f1a81652241addf3c6b24c594b55e (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 1fdb31ed54f690d6a14a55aa7d50559697421fb6
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 10 11:02:22 2015 -0400

    6438: Use urandom instead of md5(hostname) for UUID. Avoid using Ruby at this stage.

diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index 420c12a..de8f8cb 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -81,11 +81,12 @@ Retrieve the package list:
 
 h2. A unique identifier
 
-Each Arvados installation should have a globally unique identifier, which is a unique 5-character alphanumeric string. Here is a snippet of ruby that generates such a string based on the hostname of your computer:
+Each Arvados installation should have a globally unique identifier, which is a unique 5-character lowercase alphanumeric string. For testing purposes, here is one way to make a random 5-character string:
 
-<pre>
-Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4]
-</pre>
+<notextile>
+<pre><code>~$ <span class="userinput">tr -dc 0-9a-z </dev/urandom | head -c5; echo</span>
+</code></pre>
+</notextile>
 
 You may also use a different method to pick the unique identifier. The unique identifier will be part of the hostname of the services in your Arvados cluster. The rest of this documentation will refer to it as your @uuid_prefix at .
 

commit 6c38124b71b62927e880224f3a4f01874109cb08
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 10 11:00:46 2015 -0400

    6438: Add missing "apt-get update". Give a command to add the package repo.
    
    Replace version table with $(lsb_release -cs).

diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index afe2830..420c12a 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -65,11 +65,19 @@ Packages are available for Ubuntu 12.04 ("precise").  First, register the Curove
 
 {% include 'install_debian_key' %}
 
-Then save the configuration line listed for your version of Ubuntu in @/etc/apt/sources.list.d/arvados.list@:
+Configure apt to retrieve packages from the Arvados package repository:
 
-table(table table-bordered table-condensed).
-|*Ubuntu version*|*@/etc/apt/sources.list.d/arvados.list@*|
-|12.04 ("precise")|@deb http://apt.arvados.org/ precise main@|
+<notextile>
+<pre><code>~$ <span class="userinput">echo "deb http://apt.arvados.org/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/arvados.list</span>
+</code></pre>
+</notextile>
+
+Retrieve the package list:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo apt-get update</span>
+</code></pre>
+</notextile>
 
 h2. A unique identifier
 

commit 453cdbc12b93d666995f5d955f174ae8a4d6b378
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 10 10:58:29 2015 -0400

    6438: Add specific commands for nginx16 and postgresql92 Software Collections.

diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index eecabf2..3790766 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -13,7 +13,12 @@ The Arvados package repository includes an API server package that can help auto
 * Build tools and the curl and PostgreSQL development libraries, to build gem dependencies
 * Nginx
 
-On older distributions, you may need to use a backports repository to satisfy these requirements.  For example, on older Red Hat-based systems, consider using the "postgresql92":https://www.softwarecollections.org/en/scls/rhscl/postgresql92/ and "nginx16":https://www.softwarecollections.org/en/scls/rhscl/nginx16/ Software Collections.
+On older distributions, you may need to use a backports repository to satisfy these requirements.  For example, on older Red Hat-based systems, consider using the "postgresql92":https://www.softwarecollections.org/en/scls/rhscl/postgresql92/ and "nginx16":https://www.softwarecollections.org/en/scls/rhscl/nginx16/ Software Collections. For example, on CentOS 6:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo yum install scl-utils</span>
+~$ <span class="userinput">sudo yum install https://www.softwarecollections.org/en/scls/rhscl/postgresql92/epel-6-x86_64/download/rhscl-postgresql92-epel-6-x86_64.noarch.rpm</span>
+~$ <span class="userinput">sudo yum install https://www.softwarecollections.org/en/scls/rhscl/nginx16/epel-6-x86_64/download/rhscl-nginx16-epel-6-x86_64.noarch.rpm</span></code></pre></notextile>
 
 On a Debian-based system, install the following packages:
 
@@ -31,7 +36,10 @@ On a Red Hat-based system, install the following packages:
 
 {% include 'notebox_begin' %}
 
-If you intend to use specific versions of these packages from Software Collections, you may have to adapt some of the package names to match; e.g., @postgresql92-postgresql-server postgresql92-postgresql-devel nginx16 at .
+If you intend to use specific versions of these packages from Software Collections, you may have to adapt some of the package names to match. For example:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo yum install postgresql92 postgresql92-postgresql-devel nginx16</span></code></pre></notextile>
 
 {% include 'notebox_end' %}
 

commit 896855457f5966f3130bba4176c1c0b9f160114d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 9 13:46:30 2015 -0400

    6438: Add some missing steps to rvm recipe. Install rvm as root.

diff --git a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
index 07f1ff2..fa6f24f 100644
--- a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
@@ -9,9 +9,16 @@ Currently, only Ruby 2.1 is supported.
 h2(#rvm). Option 1: Install with rvm
 
 <notextile>
-<pre><code>~$ <span class="userinput">gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3</span>
-~$ <span class="userinput">\curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1</span>
-~$ <span class="userinput">gem install bundler
+<pre><code><span class="userinput">sudo gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+\curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.1
+sudo -i gem install bundler
+sudo adduser "$USER" rvm
+</span></code></pre></notextile>
+
+Either log out and log back in to activate RVM, or explicitly load it in all open shells like this:
+
+<notextile>
+<pre><code><span class="userinput">source /usr/local/rvm/scripts/rvm
 </span></code></pre></notextile>
 
 h2(#fromsource). Option 2: Install from source

commit 2fed32a4c6bcc086a90037733052cb572a2f0a37
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 9 11:45:02 2015 -0400

    6438: Bring back package dependencies for "build Ruby from source" option.
    
    These used to be documented earlier in the process, but were removed.

diff --git a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
index f1bb5f2..07f1ff2 100644
--- a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
@@ -16,6 +16,35 @@ h2(#rvm). Option 1: Install with rvm
 
 h2(#fromsource). Option 2: Install from source
 
+Install prerequisites for Debian 7 or 8:
+
+<notextile>
+<pre><code><span class="userinput">sudo apt-get install \
+    bison build-essential gettext libcurl3 libcurl3-gnutls \
+    libcurl4-openssl-dev libpcre3-dev libreadline-dev \
+    libssl-dev libxslt1.1 zlib1g-dev
+</span></code></pre></notextile>
+
+Install prerequisites for CentOS 6:
+
+<notextile>
+<pre><code><span class="userinput">sudo yum install \
+    libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel \
+    patch readline-devel zlib-devel libffi-devel openssl-devel \
+    automake libtool bison sqlite-devel
+</span></code></pre></notextile>
+
+Install prerequisites for Ubuntu 12.04:
+
+<notextile>
+<pre><code><span class="userinput">sudo apt-get install \
+    gawk g++ gcc make libc6-dev libreadline6-dev zlib1g-dev libssl-dev \
+    libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev \
+    libncurses5-dev automake libtool bison pkg-config libffi-dev
+</span></code></pre></notextile>
+
+Build and install Ruby:
+
 <notextile>
 <pre><code><span class="userinput">mkdir -p ~/src
 cd ~/src

commit e39a5e062b86e677a1d990066670efb512c7fe72
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 9 11:38:13 2015 -0400

    6438: Drop wget dependency. Update ./configure flags for Ruby 2.1.6.

diff --git a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
index 2142aca..f1bb5f2 100644
--- a/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites-ruby.html.textile.liquid
@@ -19,10 +19,9 @@ h2(#fromsource). Option 2: Install from source
 <notextile>
 <pre><code><span class="userinput">mkdir -p ~/src
 cd ~/src
-wget http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.6.tar.gz
-tar xzf ruby-2.1.6.tar.gz
+curl http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.6.tar.gz | tar xz
 cd ruby-2.1.6
-./configure --no-rdoc --no-ri
+./configure --no-install-rdoc
 make
 sudo make install
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list