[ARVADOS] created: 013435116328adc0acc01173e47a6da5b59f50fe
Git user
git at public.curoverse.com
Wed Jun 8 17:31:22 EDT 2016
at 013435116328adc0acc01173e47a6da5b59f50fe (commit)
commit 013435116328adc0acc01173e47a6da5b59f50fe
Author: Brett Smith <brett at curoverse.com>
Date: Wed Jun 8 17:28:24 2016 -0400
9309: Add CentOS 7 to Install Guide.
diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid
index cd1aeaf..1a3707f 100644
--- a/doc/_includes/_install_ruby_and_bundler.liquid
+++ b/doc/_includes/_install_ruby_and_bundler.liquid
@@ -30,7 +30,7 @@ Install prerequisites for Debian 7 or 8:
libssl-dev libxslt1.1 zlib1g-dev
</span></code></pre></notextile>
-Install prerequisites for CentOS 6:
+Install prerequisites for CentOS 6 or 7:
<notextile>
<pre><code><span class="userinput">sudo yum install \
diff --git a/doc/_includes/_note_python27_sc.liquid b/doc/_includes/_note_python_sc.liquid
similarity index 62%
rename from doc/_includes/_note_python27_sc.liquid
rename to doc/_includes/_note_python_sc.liquid
index b5ad5d2..8f0ae94 100644
--- a/doc/_includes/_note_python27_sc.liquid
+++ b/doc/_includes/_note_python_sc.liquid
@@ -1,6 +1,8 @@
{% include 'notebox_begin' %}
-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.
+{% if rh_version %} On CentOS {{rh_version}} and RHEL {{rh_version}},
+{% else %} On CentOS and RHEL,
+{% endif %} these packages require a more recent version of Python from Software Collections. 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:
diff --git a/doc/install/install-compute-node.html.textile.liquid b/doc/install/install-compute-node.html.textile.liquid
index a2e3e01..2696b5a 100644
--- a/doc/install/install-compute-node.html.textile.liquid
+++ b/doc/install/install-compute-node.html.textile.liquid
@@ -8,19 +8,27 @@ h2. Install dependencies
First, "add the appropriate package repository for your distribution":{{ site.baseurl }}/install/install-manual-prerequisites.html#repos.
-{% include 'note_python27_sc' %}
+{% include 'note_python_sc' %}
-On Debian-based systems:
+On CentOS 6 and RHEL 6:
<notextile>
-<pre><code>~$ <span class="userinput">sudo apt-get install perl python-virtualenv fuse python-arvados-python-client python-arvados-fuse crunchrunner crunchstat arvados-docker-cleaner iptables ca-certificates</span>
+<pre><code>~$ <span class="userinput">sudo yum install perl python27-python-virtualenv fuse python27-python-arvados-python-client python27-python-arvados-fuse crunchrunner crunchstat arvados-docker-cleaner iptables ca-certificates</span>
</code></pre>
</notextile>
-On Red Hat-based systems:
+On other Red Hat-based systems:
<notextile>
-<pre><code>~$ <span class="userinput">sudo yum install perl python27-python-virtualenv fuse python27-python-arvados-python-client python27-python-arvados-fuse crunchrunner crunchstat arvados-docker-cleaner iptables ca-certificates</span>
+<pre><code>~$ <span class="userinput">sudo yum install perl python-virtualenv fuse python-arvados-python-client crunchrunner crunchstat arvados-docker-cleaner iptables ca-certificates</span>
+~$ <span class="userinput">sudo yum install --disablerepo=epel python-arvados-fuse</span>
+</code></pre>
+</notextile>
+
+On Debian-based systems:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo apt-get install perl python-virtualenv fuse python-arvados-python-client python-arvados-fuse crunchrunner crunchstat arvados-docker-cleaner iptables ca-certificates</span>
</code></pre>
</notextile>
@@ -97,6 +105,9 @@ exec svlogd -tt main
EOF</span>
/etc/sv/arvados-docker-cleaner$ <span class="userinput">sudo sh -c 'cat >run' <<'EOF'
#!/bin/sh
+if [ -d /opt/rh/python33 ]; then
+ source scl_source python33 enable
+fi
exec python3 -m arvados_docker.cleaner --quota <b>50G</b>
EOF</span>
/etc/sv/arvados-docker-cleaner$ <span class="userinput">sudo chmod +x run log/run</span>
diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index f0599d6..939e796 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -27,7 +27,7 @@ On any host where you install Arvados software, you'll need to set up an Arvados
h3. CentOS
-Packages are available for CentOS 6. First, register the Curoverse signing key in RPM's database:
+Packages are available for CentOS 6 and 7. First, register the Curoverse signing key in RPM's database:
{% include 'install_redhat_key' %}
diff --git a/doc/install/install-postgresql.html.textile.liquid b/doc/install/install-postgresql.html.textile.liquid
index f27e629..f611df8 100644
--- a/doc/install/install-postgresql.html.textile.liquid
+++ b/doc/install/install-postgresql.html.textile.liquid
@@ -27,6 +27,20 @@ h2(#centos6). Install PostgreSQL on CentOS 6
<notextile><pre>~$ <span class="userinput">sudo service rh-postgresql94-postgresql start</span></pre></notextile>
# "Set up Arvados credentials and databases":#rails_setup for the services that will use this PostgreSQL install.
+h2(#centos7). Install PostgreSQL on CentOS 7
+
+# Install PostgreSQL:
+ <notextile><pre>~$ <span class="userinput">sudo yum install postgresql-server</span></pre></notextile>
+# Initialize the database:
+ <notextile><pre>~$ <span class="userinput">sudo postgresql-setup initdb</span></pre></notextile>
+# Configure the database to accept password connections:
+ <notextile><pre><code>~$ <span class="userinput">sudo sed -ri -e 's/^(host +all +all +(127\.0\.0\.1\/32|::1\/128) +)ident$/\1md5/' /var/lib/pgsql/data/pg_hba.conf</span></code></pre></notextile>
+# Configure the database to launch at boot:
+ <notextile><pre>~$ <span class="userinput">sudo systemctl enable postgresql</span></pre></notextile>
+# Start the database:
+ <notextile><pre>~$ <span class="userinput">sudo systemctl start postgresql</span></pre></notextile>
+# "Set up Arvados credentials and databases":#rails_setup for the services that will use this PostgreSQL install.
+
h2(#debian). Install PostgreSQL on Debian or Ubuntu
# Install PostgreSQL:
diff --git a/doc/install/install-shell-server.html.textile.liquid b/doc/install/install-shell-server.html.textile.liquid
index 3d3f4b4..3c33eb7 100644
--- a/doc/install/install-shell-server.html.textile.liquid
+++ b/doc/install/install-shell-server.html.textile.liquid
@@ -42,19 +42,28 @@ If you're not using RVM:
h2. Install the Python SDK and utilities
-{% include 'note_python27_sc' %}
+{% assign rh_version = "6" %}
+{% include 'note_python_sc' %}
-On Debian-based systems:
+On CentOS 6 and RHEL 6:
<notextile>
-<pre><code>~$ <span class="userinput">sudo apt-get install python-arvados-python-client python-arvados-fuse crunchrunner</span>
+<pre><code>~$ <span class="userinput">sudo yum install python27-python-arvados-python-client python27-python-arvados-fuse crunchrunner</span>
</code></pre>
</notextile>
-On Red Hat-based systems:
+On other Red Hat-based systems:
<notextile>
-<pre><code>~$ <span class="userinput">sudo yum install python27-python-arvados-python-client python27-python-arvados-fuse crunchrunner</span>
+<pre><code>~$ <span class="userinput">sudo yum install python-arvados-python-client crunchrunner</span>
+~$ <span class="userinput">sudo yum install --disablerepo=epel python-arvados-fuse</span>
+</code></pre>
+</notextile>
+
+On Debian-based systems:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo apt-get install python-arvados-python-client python-arvados-fuse crunchrunner</span>
</code></pre>
</notextile>
@@ -121,17 +130,28 @@ If you're not using RVM:
Install cron.
-On Debian-based systems:
+On CentOS 6 and RHEL 6:
<notextile>
-<pre><code>~$ <span class="userinput">sudo apt-get install cron</span>
+<pre><code>~$ <span class="userinput">sudo yum install cronie</span>
+~$ <span class="userinput">sudo chkconfig crond on</span>
+~$ <span class="userinput">sudo service crond start</span>
</code></pre>
</notextile>
-On Red Hat-based systems:
+On other Red Hat-based distributions:
<notextile>
-<pre><code>~$ <span class="userinput">sudo yum install cron</span>
+<pre><code>~$ <span class="userinput">sudo yum install cronie</span>
+~$ <span class="userinput">sudo systemctl enable crond</span>
+~$ <span class="userinput">sudo systemctl start crond</span>
+</code></pre>
+</notextile>
+
+On Debian-based systems:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo apt-get install cron</span>
</code></pre>
</notextile>
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index 5a60ca5..4aeeb5a 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -16,7 +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' %}
+{% assign rh_version = "6" %}
+{% include 'note_python_sc' %}
On a Debian-based system, install the following packages:
diff --git a/doc/sdk/python/sdk-python.html.textile.liquid b/doc/sdk/python/sdk-python.html.textile.liquid
index b86a7fb..a6a0b56 100644
--- a/doc/sdk/python/sdk-python.html.textile.liquid
+++ b/doc/sdk/python/sdk-python.html.textile.liquid
@@ -24,19 +24,27 @@ h4. Option 1: Install from distribution packages
First, "add the appropriate package repository for your distribution":{{ site.baseurl }}/install/install-manual-prerequisites.html#repos.
-{% include 'note_python27_sc' %}
+{% assign rh_version = "6" %}
+{% include 'note_python_sc' %}
-On Debian-based systems:
+On CentOS 6 and RHEL 6:
<notextile>
-<pre><code>~$ <span class="userinput">sudo apt-get install python-arvados-python-client</code>
+<pre><code>~$ <span class="userinput">sudo yum install python27-python-arvados-python-client</code>
</code></pre>
</notextile>
-On Red Hat-based systems:
+On other Red Hat-based systems:
<notextile>
-<pre><code>~$ <span class="userinput">sudo yum install python27-python-arvados-python-client</code>
+<pre><code>~$ <span class="userinput">sudo yum install python-arvados-python-client</code>
+</code></pre>
+</notextile>
+
+On Debian-based systems:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo apt-get install python-arvados-python-client</code>
</code></pre>
</notextile>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list