[ARVADOS] created: 1.3.0-1716-g9d2cf97c1

[Git user]

        at  9d2cf97c13005304f0a9031fd5d88ac89906bb33 (commit)


commit 9d2cf97c13005304f0a9031fd5d88ac89906bb33
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Oct 10 11:10:06 2019 -0400

    15424: Add WelcomePageHTML to config, with default text
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 4e3bf6d6c..6389fceb7 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1057,5 +1057,25 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Workbench welcome screen, this is HTML text that will be
+      # incorporated directly onto the page.
+      WelcomePageHTML: |
+        <div>
+        <img src="arvados-logo-big.png" style="width: 20%; float: left; padding: 1em;" />
+        <h2>Please log in.</h2>
+
+        <p>The "Log in" button below will show you a sign-in
+        page. After you log in, you will be redirected back to
+        Arvados Workbench.</p>
+
+        <p>If you have never used Arvados Workbench before, logging in
+        for the first time will automatically create a new
+        account.</p>
+
+        <i>Arvados Workbench uses your name and email address only for
+        identification, and does not retrieve any other personal
+        information.</i>
+        </div>
+
     # Use experimental controller code (see https://dev.arvados.org/issues/14287)
     EnableBetaController14287: false
diff --git a/lib/config/export.go b/lib/config/export.go
index 5437836f6..cd58868ed 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -207,6 +207,7 @@ var whitelist = map[string]bool{
 	"Workbench.UserProfileFormFields.*.*.*":        true,
 	"Workbench.UserProfileFormMessage":             true,
 	"Workbench.VocabularyURL":                      true,
+	"Workbench.WelcomePageHTML":                    true,
 }
 
 func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index d21bb2d28..42d94da78 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1063,6 +1063,26 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Workbench welcome screen, this is HTML text that will be
+      # incorporated directly onto the page.
+      WelcomePageHTML: |
+        <div>
+        <img src="arvados-logo-big.png" style="width: 20%; float: left; padding: 1em;" />
+        <h2>Please log in.</h2>
+
+        <p>The "Log in" button below will show you a sign-in
+        page. After you log in, you will be redirected back to
+        Arvados Workbench.</p>
+
+        <p>If you have never used Arvados Workbench before, logging in
+        for the first time will automatically create a new
+        account.</p>
+
+        <i>Arvados Workbench uses your name and email address only for
+        identification, and does not retrieve any other personal
+        information.</i>
+        </div>
+
     # Use experimental controller code (see https://dev.arvados.org/issues/14287)
     EnableBetaController14287: false
 `)
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 7c1c35380..638c56fb9 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -207,6 +207,7 @@ type Cluster struct {
 		}
 		UserProfileFormMessage string
 		VocabularyURL          string
+		WelcomePageHTML        string
 	}
 
 	EnableBetaController14287 bool

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


hooks/post-receive
--