Update config template, release notes, dev version

deploy.cfg.example

@@ -1,39 +1,39 @@
 # Copy this file to deploy.cfg and fill in as instructed.
 
 [Workspace]
-# NOTE: the credentials below must work not only for the main workspace
+# NOTE: The MongoDB credentials below must work not only for the main workspace
 # database, but also for the type database.
 
-# host where mongo lives, e.g. localhost:27017
+# Host where mongo lives, e.g. localhost:27017
 mongodb-host = localhost
 
-# name of the workspace mongo database
+# Name of the workspace mongo database
 mongodb-database = workspace
 
-# the user name for an account with readWrite access to the database
+# The user name for an account with readWrite access to the database
 #mongodb-user = add username here
 
-# password for the account
+# Password for the account
 #mongodb-pwd = add password here
 
 # The name of the type database. This cannot be the same as the workspace database.
 # WARNING: Once any data has been saved by the workspace, changing the type database will
 # result in unspecified behavior, including data corruption.
 mongodb-type-database = types
 
-# the legacy KBase authorization server url.
+# The legacy KBase authorization server url.
 auth-service-url = https://kbase.us/services/auth/api/legacy/KBase/Sessions/Login
 
-# the KBase authorization service mkII url.
+# The KBase authorization service mkII url.
 auth2-service-url = https://kbase.us/services/auth
 
-# the urls for the Handle Service and Handle Manager.
+# The urls for the Handle Service and Handle Manager.
 handle-service-url =
 handle-manager-url =
 # The token used to access the handle manager.
 handle-manager-token = 
 
-# the user name for a workspace administrator. This name is not permanently
+# The user name for a workspace administrator. This name is not permanently
 # stored in the database and thus the administrator will change if this name
 # is changed and the server restarted.
 ws-admin = workspaceadmin
@@ -46,42 +46,42 @@ ws-admin = workspaceadmin
 auth2-ws-admin-read-only-roles =
 auth2-ws-admin-full-roles =
 
-# The type of the backend that will store the workspace data. Either GridFS or Shock.
+# The type of the backend that will store the workspace data. Either 'GridFS' or 'Shock'.
 backend-type = GridFS
 
-# token for the backend account. Not required for GridFS.
+# Token for the backend account. Not required for GridFS.
 backend-token =
 
-# username for the backend account. This name is checked against the token as a safety measure.
+# Username for the backend account. This name is checked against the token as a safety measure.
 # WARNING: Once any data has been saved by the workspace, changing the backend username
 # (except for the GridFS backend) will result in unspecified behavior, including data corruption.
 backend-user =
 
 # URL for the backend service. Not required for GridFS.
 backend-url = https://kbase.us/services/shock-api
 
-# port for the service.
+# Port for the service.
 port = 7058
 
-# server thread count - this determines the number of requests that can be
+# Server thread count - this determines the number of requests that can be
 # processed simultaneously.
 server-threads = 20
 
-# minimum memory size in MB. This must be 500Mb * server-threads.
+# Minimum memory size in MB. This must be 500Mb * server-threads.
 min-memory = 10000
 
-# maximum memory size in MB.
+# Maximum memory size in MB.
 max-memory = 15000
 
-# directory for temporary files. Maximum usage is 10GB * server-threads.
+# Directory for temporary files. Maximum usage is 10GB * server-threads.
 # Ideally, this will be on an SSD drive for speed.
 temp-dir = ws_temp_dir
 
-# active listeners - a comma separated list, by name, of event listeners that will be registered.
+# Active listeners - a comma separated list, by name, of event listeners that will be registered.
 # Add or remove a name from the list in order to activate or deactivate a listener.
 # listeners=X
 
-# any listener factory implementations and their configurations, grouped by the names in the
+# Any listener factory implementations and their configurations, grouped by the names in the
 # listeners configuration parameter. The listener configuration will be provided to the listener
 # as a key-value map. Example:
 # listener-X-class=us.kbase.workspace.test.listener.NullListenerFactory
@@ -90,12 +90,12 @@ temp-dir = ws_temp_dir
 # listener-X-config-printEvents=true
 # listener-X-config-throwException=false
 
-# an example configuration for the Kafka listener
+# An example configuration for the Kafka listener
 #listener-Kafka-class=us.kbase.workspace.modules.KafkaNotifierFactory
 #listener-Kafka-config-topic=ws
 #listener-Kafka-config-bootstrap.servers=localhost:9092
 
-# document server name. Used for logging.
+# Document server name. Used for logging.
 doc-server-name = WorkspaceDocServ
 # Document server document location relative to the classpath. If this
 # variable is changed it must also be changed in build.xml

deployment/conf/.templates/deployment.cfg.templ

@@ -1,10 +1,14 @@
 [Workspace]
 mongodb-database={{ default .Env.mongodb_database "workspace" }}
+mongodb-type-database={{ default .Env.mongodb_type_database "workspace_type_db" }}
 mongodb-pwd={{ default .Env.mongodb_pwd "" }}
 ws-admin={{ default .Env.ws_admin "scanonadmin" }}
 # backend user is wstest globus user in ci
 # use that acct to generate token
+backend-type={{ default .Env.backend_type ""}}
+backend-url={{ default .Env.backend_url ""}}
 backend-token={{ default .Env.backend_token "" }}
+backend-user={{ default .Env.backend_user "" }}
 mongodb-host={{ default .Env.mongodb_host "ci-mongo" }}
 mongodb-user={{ default .Env.mongodb_user "wsserv" }}
 service-port={{ default .Env.service_port "7058" }}