Merge branch '15928-fs-deadlock'

[arvados.git] / doc / install / install-sso.html.textile.liquid

diff --git a/doc/install/install-sso.html.textile.liquid b/doc/install/install-sso.html.textile.liquid
index e86116a4c3f66b6d8d39b7bbd5fb1597e9313631..fbed12495b6d5f541f2d01286d929ead4ff5113b 100644 (file)
--- a/doc/install/install-sso.html.textile.liquid
+++ b/doc/install/install-sso.html.textile.liquid
@@ -15,7 +15,7 @@ The Arvados package repository includes an SSO server package that can help auto
 
 h3(#install_ruby_and_bundler). Install Ruby and Bundler
 
-{% include 'install_ruby_and_bundler' %}
+{% include 'install_ruby_and_bundler_sso' %}
 
 h3(#install_web_server). Set up a Web server
 
@@ -236,9 +236,9 @@ In order to use Google+ authentication, you must use the <a href="https://consol
 # If the authorization origins are not displayed, clicking on *Create Client ID* will take you to *Consent screen* settings.
 ## On consent screen settings, enter the appropriate details and click on *Save*.
 ## This will return you to the *Create Client ID* dialog box.
-# You must set the authorization origins.  Edit @sso.your-site.com@ to the appropriate hostname that you will use to access the SSO service:
-## JavaScript origin should be @https://sso.your-site.com/@
-## Redirect URI should be @https://sso.your-site.com/users/auth/google_oauth2/callback@
+# You must set the authorization origins.  Edit @auth.your.domain@ to the appropriate hostname that you will use to access the SSO service:
+## JavaScript origin should be @https://auth.your.domain/@
+## Redirect URI should be @https://auth.your.domain/users/auth/google_oauth2/callback@
 # Copy the values of *Client ID* and *Client secret* from the Google Developers Console into the Google section of @config/application.yml@, like this:
 
 <notextile>