20690: Remove obsolete SecretKeyBase configs.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/config/export.go b/lib/config/export.go
index cbd9ff6d7f982c2818829b89f7a15fab9b5ca044..20dd9643b02f5afc91932eb5458e7277a75ed10a 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -292,7 +292,6 @@ var whitelist = map[string]bool{
        "Workbench.Repositories":                              false,
        "Workbench.RepositoryCache":                           false,
        "Workbench.RunningJobLogRecordsToFetch":               true,
-       "Workbench.SecretKeyBase":                             false,
        "Workbench.ShowRecentCollectionsOnDashboard":          true,
        "Workbench.ShowUserAgreementInline":                   true,
        "Workbench.ShowUserNotifications":                     true,

diff --git a/lib/install/init.go b/lib/install/init.go
index c362c32b872bec65d7c8f79ad5cb29b8c04f9a8c..d9b74f6a0630600680f8bc3516f97376e72924b7 100644 (file)
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -301,8 +301,6 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
         DriverParameters:
           Root: /var/lib/arvados/keep
         Replication: 2
-    Workbench:
-      SecretKeyBase: {{printf "%q" ( .RandomHex 50 )}}
     {{if .LoginPAM}}
     Login:
       PAM:

diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index dfc9d1fece777629d65088867fd48c347bbd2feb..62aea092de55cacbbf7bceb5710341219d2b6316 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -56,11 +56,6 @@ if ! (psql postgres -c "\du" | grep "^ arvados ") >/dev/null ; then
 fi
 psql postgres -c "ALTER USER arvados WITH SUPERUSER;"
 
-if ! test -s $ARVADOS_CONTAINER_PATH/workbench_secret_token ; then
-  ruby -e 'puts rand(2**400).to_s(36)' > $ARVADOS_CONTAINER_PATH/workbench_secret_token
-fi
-workbench_secret_key_base=$(cat $ARVADOS_CONTAINER_PATH/workbench_secret_token)
-
 if test -s $ARVADOS_CONTAINER_PATH/api_rails_env ; then
   database_env=$(cat $ARVADOS_CONTAINER_PATH/api_rails_env)
 else
@@ -138,9 +133,6 @@ Clusters:
       AutoSetupNewUsers: true
       AutoSetupNewUsersWithVmUUID: $vm_uuid
       AutoSetupNewUsersWithRepository: true
-    Workbench:
-      SecretKeyBase: $workbench_secret_key_base
-      ArvadosDocsite: http://$localip:${services[doc]}/
     Git:
       GitCommand: /usr/share/gitolite3/gitolite-shell
       GitoliteHome: $ARVADOS_CONTAINER_PATH/git
@@ -175,7 +167,6 @@ chmod og-rw \
       $ARVADOS_CONTAINER_PATH/management_token \
       $ARVADOS_CONTAINER_PATH/system_root_token \
       $ARVADOS_CONTAINER_PATH/api_database_pw \
-      $ARVADOS_CONTAINER_PATH/workbench_secret_token \
       $ARVADOS_CONTAINER_PATH/superuser_token \
 set -e