[ARVADOS] updated: 102d938387b2bbfe5b2e7bd9b8267b767a15719b

git at public.curoverse.com git at public.curoverse.com
Tue Sep 8 13:57:05 EDT 2015


Summary of changes:
 doc/_includes/_install_ruby_and_bundler.liquid     |  2 +-
 doc/install/install-api-server.html.textile.liquid | 27 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

       via  102d938387b2bbfe5b2e7bd9b8267b767a15719b (commit)
       via  8099379a9d74e9292464cdc1aa326a726633288e (commit)
      from  eb73e21144a3b6460d7550583860b25fba3fffc8 (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 102d938387b2bbfe5b2e7bd9b8267b767a15719b
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Sep 8 13:56:19 2015 -0400

    7170: Fix Ruby configure switch typo.
    
    --no-install-rdoc should be spelled --disable-install-rdoc.
    Refs #7170.

diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid
index 369bf46..502e2bc 100644
--- a/doc/_includes/_install_ruby_and_bundler.liquid
+++ b/doc/_includes/_install_ruby_and_bundler.liquid
@@ -56,7 +56,7 @@ Build and install Ruby:
 cd ~/src
 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-install-rdoc
+./configure --disable-install-rdoc
 make
 sudo make install
 

commit 8099379a9d74e9292464cdc1aa326a726633288e
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Sep 8 13:36:17 2015 -0400

    Move arvados-api-server-upgrade.sh down in install guide.
    
    Same rationale as 2a6a3720271a12bc8a47928ade5b2c641514ca44.
    No issue #.

diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index f2a518a..fb43f78 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -197,19 +197,6 @@ Example @application.yml@:
 </code></pre>
 </notextile>
 
-h2. Prepare the API server deployment
-
-Now that all your configuration is in place, run @/usr/local/bin/arvados-api-server-upgrade.sh at .  This will install and check your configuration, install necessary gems, and run any necessary database setup.
-
-{% include 'notebox_begin' %}
-You can safely ignore the following messages if they appear while this script runs:
-<pre>Don't run Bundler as root. Bundler can ask for sudo if it is needed, and installing your bundle as root will
-break this application for all non-root users on this machine.</pre>
-<pre>fatal: Not a git repository (or any of the parent directories): .git</pre>
-{% 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). Set up Web servers
 
 For best performance, we recommend you use Nginx as your Web server front-end, with a Passenger backend for the main API server and a Puma backend for API server Websockets.  To do that:
@@ -345,3 +332,17 @@ server {
 
 </ol>
 </notextile>
+
+h2. Prepare the API server deployment
+
+Now that all your configuration is in place, run @/usr/local/bin/arvados-api-server-upgrade.sh at .  This will install and check your configuration, install necessary gems, and run any necessary database setup.
+
+{% include 'notebox_begin' %}
+You can safely ignore the following messages if they appear while this script runs:
+<pre>Don't run Bundler as root. Bundler can ask for sudo if it is needed, and installing your bundle as root will
+break this application for all non-root users on this machine.</pre>
+<pre>fatal: Not a git repository (or any of the parent directories): .git</pre>
+{% 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.
+

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list