[ARVADOS] created: 1.3.0-1806-ge51103a78

[Git user]

        at  e51103a789f4b246b2dcdac2b2fa215c707500b7 (commit)


commit e51103a789f4b246b2dcdac2b2fa215c707500b7
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Oct 25 16:40:43 2019 -0400

    13936: Add default InactivePageHTML 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 52856c843..9f473e361 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1060,7 +1060,7 @@ Clusters:
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |
-        <img src="arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
         <h2>Please log in.</h2>
 
         <p>The "Log in" button below will show you a sign-in
@@ -1075,5 +1075,12 @@ Clusters:
         identification, and does not retrieve any other personal
         information.</i>
 
+      InactivePageHTML: |
+        <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <h3>Hi! You're logged in, but...</h3>
+        <p>Your account is inactive.</p>
+        <p>An administrator must activate your account before you can get
+        any further.</p>
+
     # 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 cd58868ed..5f17b3459 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -208,6 +208,7 @@ var whitelist = map[string]bool{
 	"Workbench.UserProfileFormMessage":             true,
 	"Workbench.VocabularyURL":                      true,
 	"Workbench.WelcomePageHTML":                    true,
+	"Workbench.InactivePageHTML":                   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 6e7aba81d..dbf11569f 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1066,7 +1066,7 @@ Clusters:
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |
-        <img src="arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
         <h2>Please log in.</h2>
 
         <p>The "Log in" button below will show you a sign-in
@@ -1081,6 +1081,13 @@ Clusters:
         identification, and does not retrieve any other personal
         information.</i>
 
+      InactivePageHTML: |
+        <img src="/arvados-logo-big.png" style="width: 20%; float: right; padding: 1em;" />
+        <h3>Hi! You're logged in, but...</h3>
+        <p>Your account is inactive.</p>
+        <p>An administrator must activate your account before you can get
+        any further.</p>
+
     # 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 638c56fb9..952fde5d1 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -208,6 +208,7 @@ type Cluster struct {
 		UserProfileFormMessage string
 		VocabularyURL          string
 		WelcomePageHTML        string
+		InactivePageHTML       string
 	}
 
 	EnableBetaController14287 bool

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


hooks/post-receive
--