[ARVADOS] updated: a8b431b5cfccd36995514560f965b4943ac93c6b

Tue Aug 25 21:30:03 EDT 2015

Summary of changes:
 .../install-workbench-app.html.textile.liquid      | 46 +++++++++++++---------
 1 file changed, 27 insertions(+), 19 deletions(-)

       via  a8b431b5cfccd36995514560f965b4943ac93c6b (commit)
       via  36b1667a9b2ab888a80e84b6ecd75403c8f6782c (commit)
       via  2a6a3720271a12bc8a47928ade5b2c641514ca44 (commit)
      from  2c9b40bdc8acd7fdd906c80e2c7f44abfb720de3 (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 a8b431b5cfccd36995514560f965b4943ac93c6b
Merge: 2c9b40b 36b1667
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Aug 25 21:29:10 2015 -0400

    Merge branch '6940-workbench-centos-install-wip'
    
    Closes #6940, #7053.


commit 36b1667a9b2ab888a80e84b6ecd75403c8f6782c
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Aug 20 12:59:56 2015 -0400

    6940: Workbench install guide describes using Nginx with Software Collections.
    
    Because Workbench invokes arv-get, it needs this configuration to find
    arv-get in the Software Collection root.

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index 91dd1f1..52a69f5 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -95,6 +95,14 @@ For best performance, we recommend you use Nginx as your Web server front-end, w
 <ol>
 <li><a href="https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html">Install Nginx and Phusion Passenger</a>.</li>
 
+<li>If you're deploying on CentOS and using the python27 Software Collection, configure Nginx to use it:
+
+<pre><code>~$ <span class="userinput">sudo usermod --shell /bin/bash nginx</span>
+~$ <span class="userinput">sudo -u nginx sh -c 'echo "[[ -z \$PS1 && -e /opt/rh/python27/enable ]] && source /opt/rh/python27/enable" >>~/.bash_profile'</span>
+</code></pre>
+
+</li>
+
 <li><p>Edit the http section of your Nginx configuration to run the Passenger server, and act as a front-end for it.  You might add a block like the following, adding SSL and logging parameters to taste:</p>
 
 <pre><code>server {

commit 2a6a3720271a12bc8a47928ade5b2c641514ca44
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Aug 20 11:13:03 2015 -0400

    6940: Move arvados-workbench-upgrade.sh down in install guide.
    
    The script tries to restart Nginx, so Nginx should be set up first.
    No issue #.

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index b478286..91dd1f1 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -87,25 +87,6 @@ h2. Configure Piwik
 
 In @/var/www/arvados-workbench/current/config@, copy @piwik.yml.example@ to @piwik.yml@ and edit to suit.
 
-h2. Prepare the Workbench deployment
-
-Now that all your configuration is in place, run @/usr/local/bin/arvados-workbench-upgrade.sh at .  This will install and check your configuration, and install necessary gems.
-
-{% include 'notebox_begin' %}
-You can safely ignore the following error message you may see when installing gems:
-<notextile>
-<pre><code>themes_for_rails at /usr/local/rvm/gems/ruby-2.1.1/bundler/gems/themes_for_rails-1fd2d7897d75 did not have a valid gemspec.
-This prevents bundler from installing bins or native extensions, but that may not affect its functionality.
-The validation message from Rubygems was:
-  duplicate dependency on rails (= 3.0.11, development), (>= 3.0.0) use:
-    add_runtime_dependency 'rails', '= 3.0.11', '>= 3.0.0'
-Using themes_for_rails (0.5.1) from https://github.com/holtkampw/themes_for_rails (at 1fd2d78)
-</code></pre>
-</notextile>
-{% include 'notebox_end' %}
-
-This command aborts when it encounters an error.  It's safe to rerun multiple times, so if there's a problem with your configuration, you can fix that and try again.
-
 h2. Set up Web server
 
 For best performance, we recommend you use Nginx as your Web server front-end, with a Passenger backend to serve Workbench.  To do that:
@@ -165,6 +146,25 @@ server {
 </ol>
 </notextile>
 
+h2. Prepare the Workbench deployment
+
+Now that all your configuration is in place, run @/usr/local/bin/arvados-workbench-upgrade.sh at .  This will install and check your configuration, and install necessary gems.
+
+{% include 'notebox_begin' %}
+You can safely ignore the following error message you may see when installing gems:
+<notextile>
+<pre><code>themes_for_rails at /usr/local/rvm/gems/ruby-2.1.1/bundler/gems/themes_for_rails-1fd2d7897d75 did not have a valid gemspec.
+This prevents bundler from installing bins or native extensions, but that may not affect its functionality.
+The validation message from Rubygems was:
+  duplicate dependency on rails (= 3.0.11, development), (>= 3.0.0) use:
+    add_runtime_dependency 'rails', '= 3.0.11', '>= 3.0.0'
+Using themes_for_rails (0.5.1) from https://github.com/holtkampw/themes_for_rails (at 1fd2d78)
+</code></pre>
+</notextile>
+{% include 'notebox_end' %}
+
+This command aborts when it encounters an error.  It's safe to rerun multiple times, so if there's a problem with your configuration, you can fix that and try again.
+
 h2. Trusted client setting
 
 Log in to Workbench once to ensure that the Arvados API server has a record of the Workbench client. (It's OK if Workbench says your account hasn't been activated yet. We'll deal with that next.)

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


hooks/post-receive
-- 


