Merge branch 'development' into 'master'

Development

See merge request b650/Deep-Lynx!247

.docker-env

@@ -0,0 +1,71 @@
+# should be in the format postgresql://user:password@hostname:port/database_name
+# :port is optional and if included will usually be :5432
+CORE_DB_CONNECTION_STRING=postgresql://postgres:root@timescaledb/deep_lynx_dev
+TIMESCALEDB_ENABLED=true
+WAIT_HOSTS=rabbitmq:5672
+
+# valid options are blank (defaults to memory), memory, or redis
+CACHE_PROVIDER=memory
+# default time in seconds
+CACHE_DEFAULT_TTL=21600
+# redis connection string - e.g redis://user:[email protected]:6379/
+CACHE_REDIS_CONNECTION_STRING=
+
+# debug,info,warn,error,silent
+LOG_LEVEL=debug
+
+# this must be an absolute path to a RSA private key and a matching volume must be mounted in the docker compose file
+# if one is not provided it will be generated and saved for you at the project root
+ENCRYPTION_KEY_PATH=
+
+# plaintext secret used to generate secure session markers
+SESSION_SECRET=CHANGEME
+
+# controls which queue system to use, possible values are database, rabbitmq and azure_service_bus
+QUEUE_SYSTEM=rabbitmq
+# RabbitMQ connection string
+RABBITMQ_URL=amqp://deeplynx:root@rabbitmq:5672
+
+# controls whether or not Deep Lynx should emit data events
+EMIT_EVENTS=true
+
+# whether or not to create a superuser on initial boot, along with the values
+# for its email and password - password will be encrypted prior to storage
+INITIAL_SUPERUSER=true
+[email protected]
+SUPERUSER_PASSWORD=admin
+
+# if you are bundling the web app, you must set a unique ID in order for DeepLynx to recognize the internal admin web app
+# when it attempts to authenticate against the program, we recommend at least 15 random alphanumeric characters, and not
+# a recognizable name - at no point will a user see this information
+VUE_APP_DEEP_LYNX_APP_ID=root
+
+# while you can set basic, note that the session functionality will not work. Leaving this blank
+# will remove all authentication methods
+# possible values: token, basic, (leave blank for no auth)
+AUTH_STRATEGY=token
+BASIC_USER=
+BASIC_PASSWORD=
+
+SAML_ENABLED=false
+# SAML 2.0 entry point URL
+SAML_ADFS_ENTRY_POINT=
+# Application (Client) ID
+SAML_ADFS_ISSUER=
+# Application callback route, registered with Identity provider beforehand
+SAML_ADFS_CALLBACK=
+# Self signed certificate private key (.key file)
+SAML_ADFS_PRIVATE_CERT_PATH=
+# x509 certificate extracted from ADFS metadata file
+SAML_ADFS_PUBLIC_CERT_PATH=
+
+SAML_ADFS_CLAIMS_EMAIL=
+SAML_ADFS_CLAIMS_NAME=
+
+# RSA Server settings
+RSA_URL=
+RSA_CLIENT_KEY=
+RSA_CLIENT_ID=
+
+# Email for the authorized HPC user to access tasks
+HPC_EMAIL=

.dockerignore

@@ -1,3 +1,4 @@
 node_modules
 npm-debug.log
-dist
+dist
+AdminWebApp/node_modules

.env-sample

@@ -16,6 +16,11 @@ CACHE_DEFAULT_TTL=21600
 # redis connection string - e.g redis://user:[email protected]:6379/
 CACHE_REDIS_CONNECTION_STRING=
 
+# this controls the import id caching on staging data emission and processing, only change
+# if you know what you're doing - in seconds
+INITIAL_IMPORT_CACHE_TTl=21600
+IMPORT_CACHE_TTL=30
+
 # email specific variables, controls the reset password/email validation/ links etc.
 # the URLs should refer to your UI implementation's reset password, email validation, and container invite pages
 [email protected]
@@ -31,7 +36,8 @@ LOG_LEVEL=debug
 CORE_DB_CONNECTION_STRING=postgresql://postgres:deeplynxcore@localhost/deep_lynx
 TIMESCALEDB_ENABLED=false
 
-# this must be an absolute path to a RSA private key
+# this must be an absolute path to a RSA private key - if one is not provided it will be generated and saved for you at
+# the project root
 ENCRYPTION_KEY_PATH=
 # plaintext secret used to generate secure session markers
 SESSION_SECRET=
@@ -84,7 +90,7 @@ VUE_APP_APP_URL=http://localhost:8090/#
 # if you are bundling the web app, you must set a unique ID in order for DeepLynx to recognize the internal admin web app
 # when it attempts to authenticate against the program, we recommend at least 15 random alphanumeric characters, and not
 # a recognizable name - at no point will a user see this information
-VUE_APP_DEEP_LYNX_APP_ID=sampleID
+VUE_APP_DEEP_LYNX_APP_ID=root
 
 # while you can set basic, note that the session functionality will not work. Leaving this blank
 # will remove all authentication methods