15572: Fix Services.Workbench1 typo

Add redirect http-to-https blocks for workbench.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index b33f28eb1f6f986eecec887b7622b3c94ab42699..17c6b5899c9981bea73dca57a8bf5130abea95e6 100644 (file)
--- 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 c3d67ed66ef34670207c752f35656f7accac2d88..cd71312722952479a4ca61b46bce4b9ba0f96c88 100644 (file)
--- 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>;