[ARVADOS] created: 8dca71958a040a69a1af123a77696d956ed42d08

[git at public.curoverse.com]

        at  8dca71958a040a69a1af123a77696d956ed42d08 (commit)


commit 8dca71958a040a69a1af123a77696d956ed42d08
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Dec 31 12:08:17 2015 -0500

    7957: Update Software Collections instructions in install guide.
    
    * Document the process we currently follow on CentOS 6.
    * Add a reference for RHEL instructions.
    * Move noteboxes up, so people can follow the instructions
      linearly ("enable Software Collections, then install the packages").

diff --git a/doc/_includes/_note_python27_sc.liquid b/doc/_includes/_note_python27_sc.liquid
index 7aad695..08e71f5 100644
--- a/doc/_includes/_note_python27_sc.liquid
+++ b/doc/_includes/_note_python27_sc.liquid
@@ -1,5 +1,14 @@
 {% include 'notebox_begin' %}
 
-On older Red Hat-based systems, these packages require the "python27 Software Collection":https://www.softwarecollections.org/en/scls/rhscl/python27/.
+On older Red Hat-based systems, these packages require the python27 Software Collection.  The Software Collection will be installed automatically as long as Software Collections are enabled on your system.
+
+To "enable Software Collections on CentOS":https://wiki.centos.org/AdditionalResources/Repositories/SCL, run:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo yum install centos-release-SCL scl-utils</span>
+</code></pre>
+</notextile>
+
+To enable Software Collections on RHEL, "follow section 2.1 of Red Hat's Installation chapter":https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/2/html/2.0_Release_Notes/chap-Installation.html.
 
 {% include 'notebox_end' %}
diff --git a/doc/install/install-compute-node.html.textile.liquid b/doc/install/install-compute-node.html.textile.liquid
index aa4f37d..7d13f77 100644
--- a/doc/install/install-compute-node.html.textile.liquid
+++ b/doc/install/install-compute-node.html.textile.liquid
@@ -8,6 +8,8 @@ h2. Install dependencies
 
 First, "add the appropriate package repository for your distribution":{{ site.baseurl }}/install/install-manual-prerequisites.html#repos.
 
+{% include 'note_python27_sc' %}
+
 On Debian-based systems:
 
 <notextile>
@@ -22,8 +24,6 @@ On Red Hat-based systems:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Install Docker
 
 Compute nodes must have Docker installed to run jobs inside containers.  This requires a relatively recent version of Linux (at least upstream version 3.10, or a distribution version with the appropriate patches backported).  Follow the "Docker Engine installation documentation":https://docs.docker.com/ for your distribution.
diff --git a/doc/install/install-shell-server.html.textile.liquid b/doc/install/install-shell-server.html.textile.liquid
index 08ac57f..ec4c9d4 100644
--- a/doc/install/install-shell-server.html.textile.liquid
+++ b/doc/install/install-shell-server.html.textile.liquid
@@ -28,6 +28,8 @@ If you're not using RVM:
 
 h2. Install the Python SDK and utilities
 
+{% include 'note_python27_sc' %}
+
 On Debian-based systems:
 
 <notextile>
@@ -42,8 +44,6 @@ On Red Hat-based systems:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Install Git and curl
 
 {% include 'install_git_curl' %}
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index d05d94d..9f78dfc 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -16,6 +16,8 @@ h2(#install_workbench). Install Workbench and dependencies
 
 Workbench doesn't need its own database, so it does not need to have PostgreSQL installed.
 
+{% include 'note_python27_sc' %}
+
 On a Debian-based system, install the following packages:
 
 <notextile>
@@ -30,8 +32,6 @@ On a Red Hat-based system, install the following packages:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Set up configuration files
 
 The Workbench server package uses configuration files that you write to @/etc/arvados/workbench@ and ensures they're consistently deployed.  Create this directory and copy the example configuration files to it:
@@ -95,7 +95,7 @@ For best performance, we recommend you use Nginx as your Web server front-end, w
 <ol>
 <li><a href="https://www.phusionpassenger.com/library/walkthroughs/deploy/ruby/ownserver/nginx/oss/install_passenger_main.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:
+<li>If you're deploying on an older Red Hat-based distribution and installed Pythyon 2.7 from Software Collections, 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>

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


hooks/post-receive
--