[ARVADOS] updated: 1.3.0-2003-g634d7f912

[Git user]

Summary of changes:
 doc/install/install-workbench-app.html.textile.liquid  | 10 ++++++++--
 doc/install/install-workbench2-app.html.textile.liquid |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

       via  634d7f912d8baaf5710f98f967a640c2577e242d (commit)
      from  9d47c912d10ba901521fd74e2d1a8918c2f733c3 (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 634d7f912d8baaf5710f98f967a640c2577e242d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 18 15:01:59 2019 -0500

    15572: Fix Services.Workbench1 typo
    
    Add redirect http-to-https blocks for workbench.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index b33f28eb1..17c6b5899 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -29,8 +29,8 @@ Edit @/etc/arvados/config.yml@ to set the keys below.  The full set of configura
 
 <notextile>
 <pre><code>    Services:
-      Workbench:
-        ExternalURL: <span class="userinput">"https://workbench.ClustedID.example.com"</span>
+      Workbench1:
+        ExternalURL: <span class="userinput">"https://workbench.ClusterID.example.com"</span>
     Workbench:
       SecretKeyBase: <span class="userinput">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</span>
     Users:
@@ -56,6 +56,12 @@ Use a text editor to create a new file @/etc/nginx/conf.d/arvados-workbench.conf
 
 <notextile>
 <pre><code>server {
+    listen       80;
+    server_name  workbench.<span class="userinput">ClusterID.example.com</span>;
+    return 301   https://workbench.<span class="userinput">ClusterID.example.com</span>$request_uri;
+}
+
+server {
   listen       *:443 ssl;
   server_name  workbench.<span class="userinput">ClusterID.example.com</span>;
 
diff --git a/doc/install/install-workbench2-app.html.textile.liquid b/doc/install/install-workbench2-app.html.textile.liquid
index c3d67ed66..cd7131272 100644
--- a/doc/install/install-workbench2-app.html.textile.liquid
+++ b/doc/install/install-workbench2-app.html.textile.liquid
@@ -41,6 +41,12 @@ Use a text editor to create a new file @/etc/nginx/conf.d/arvados-workbench2.con
 
 <notextile>
 <pre><code>server {
+    listen       80;
+    server_name  workbench2.<span class="userinput">ClusterID.example.com</span>;
+    return 301   https://workbench2.<span class="userinput">ClusterID.example.com</span>$request_uri;
+}
+
+server {
   listen       *:443 ssl;
   server_name  workbench2.<span class="userinput">ClusterID.example.com</span>;
 

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


hooks/post-receive
--