[ARVADOS] updated: 7d6ff766d02ddc486cb61be3a0bb9ce12e7a29ff
git at public.curoverse.com
git at public.curoverse.com
Mon Jan 11 20:24:00 EST 2016
Summary of changes:
doc/_includes/_install_rails_reconfigure.liquid | 11 +++++++++++
doc/install/install-api-server.html.textile.liquid | 8 +++-----
doc/install/install-sso.html.textile.liquid | 21 +++------------------
.../install-workbench-app.html.textile.liquid | 7 +++----
4 files changed, 20 insertions(+), 27 deletions(-)
create mode 100644 doc/_includes/_install_rails_reconfigure.liquid
via 7d6ff766d02ddc486cb61be3a0bb9ce12e7a29ff (commit)
via 378a988bbf9e29736382339f587582259b641782 (commit)
from e1276d6ebfbf073b747825cfcbfdd0054b95efa4 (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 7d6ff766d02ddc486cb61be3a0bb9ce12e7a29ff
Merge: e1276d6 378a988
Author: Brett Smith <brett at curoverse.com>
Date: Mon Jan 11 20:23:56 2016 -0500
Merge branch '8014-rails-postinst-doc-update-wip'
Refs #8014. Closes #8111.
commit 378a988bbf9e29736382339f587582259b641782
Author: Brett Smith <brett at curoverse.com>
Date: Tue Jan 5 17:33:11 2016 -0500
8014: Install guide uses new Rails postinst scripts for configuration.
diff --git a/doc/_includes/_install_rails_reconfigure.liquid b/doc/_includes/_install_rails_reconfigure.liquid
new file mode 100644
index 0000000..b2f2965
--- /dev/null
+++ b/doc/_includes/_install_rails_reconfigure.liquid
@@ -0,0 +1,11 @@
+Now that all your configuration is in place, rerun the {{railspkg}} package configuration to install necessary Ruby Gems and other server dependencies. On Debian-based systems:
+
+<notextile><pre><code>~$ <span class="userinput">sudo dpkg-reconfigure {{railspkg}}</span>
+</code></pre></notextile>
+
+On Red Hat-based systems:
+
+<notextile><pre><code>~$ <span class="userinput">sudo yum reinstall {{railspkg}}</span>
+</code></pre></notextile>
+
+You only need to do this manual step once, after initial configuration. When you make configuration changes in the future, you just need to restart Nginx for them to take effect.
\ No newline at end of file
diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 20a8a97..fae06de 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -340,14 +340,12 @@ server {
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.
+{% assign railspkg = "arvados-api-server" %}
+{% include 'install_rails_reconfigure' %}
{% include 'notebox_begin' %}
-You can safely ignore the following messages if they appear while this script runs:
+You can safely ignore the following messages if they appear while this command 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.
-
diff --git a/doc/install/install-sso.html.textile.liquid b/doc/install/install-sso.html.textile.liquid
index 1a3e4b3..a306403 100644
--- a/doc/install/install-sso.html.textile.liquid
+++ b/doc/install/install-sso.html.textile.liquid
@@ -128,7 +128,7 @@ Enter password for new role: <span class="userinput">paste-database-password-you
Enter it again: <span class="userinput">paste-database-password-you-generated</span>
</code></pre></notextile>
-Rails will take care of creating the database, based on the information from @/etc/arvados/sso/database.yml at .
+Rails will take care of creating the database, based on the information from @/etc/arvados/sso/database.yml at .
Alternatively, if the database user you intend to use for the SSO server should not be allowed to create new databases, the user and the database can be created like this:
@@ -141,21 +141,8 @@ Enter it again: <span class="userinput">paste-database-password-you-generated</s
h2(#reconfigure_package). Reconfigure the package
-Now that the @/etc/arvados/sso/application.yml@ and @/etc/arvados/sso/database.yml@ files have been updated, we need to reconfigure our installed package. Doing so will create and/or initialize the database and precompile the assets.
-
-On a Debian-based system:
-
-<notextile>
-<pre><code>~$ <span class="userinput">sudo dpkg-reconfigure arvados-sso-server</span>
-</code></pre>
-</notextile>
-
-On a Red Hat-based system, we need to reinstall the package instead:
-
-<notextile>
-<pre><code>~$ <span class="userinput">sudo yum reinstall arvados-sso-server</span>
-</code></pre>
-</notextile>
+{% assign railspkg = "arvados-sso-server" %}
+{% include 'install_rails_reconfigure' %}
h2(#client). Create arvados-server client
@@ -309,5 +296,3 @@ In order to use Google+ authentication, you must use the <a href="https://consol
<pre><code> # Google API tokens required for OAuth2 login.
google_oauth2_client_id: <span class="userinput">"---YOUR---CLIENT---ID---HERE--"-</span>
google_oauth2_client_secret: <span class="userinput">"---YOUR---CLIENT---SECRET---HERE--"-</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 7f504a9..1fd525d 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -162,10 +162,11 @@ server {
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.
+{% assign railspkg = "arvados-workbench" %}
+{% include 'install_rails_reconfigure' %}
{% include 'notebox_begin' %}
-You can safely ignore the following error message you may see when installing gems:
+You can safely ignore the following error message you may see when Ruby Gems are installed:
<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.
@@ -177,8 +178,6 @@ Using themes_for_rails (0.5.1) from https://github.com/holtkampw/themes_for_rail
</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
--
More information about the arvados-commits
mailing list