Merge branch 'Master' into 'Pipedrive-OAuth2-support'

packages/cli/config/index.ts

@@ -63,6 +63,34 @@ const config = convict({
 				default: 'public',
 				env: 'DB_POSTGRESDB_SCHEMA'
 			},
+
+			ssl: {
+				ca: {
+					doc: 'SSL certificate authority',
+					format: String,
+					default: '',
+					env: 'DB_POSTGRESDB_SSL_CA',
+				},
+				cert: {
+					doc: 'SSL certificate',
+					format: String,
+					default: '',
+					env: 'DB_POSTGRESDB_SSL_CERT',
+				},
+				key: {
+					doc: 'SSL key',
+					format: String,
+					default: '',
+					env: 'DB_POSTGRESDB_SSL_KEY',
+				},
+				rejectUnauthorized: {
+					doc: 'If unauthorized SSL connections should be rejected',
+					format: 'Boolean',
+					default: true,
+					env: 'DB_POSTGRESDB_SSL_REJECT_UNAUTHORIZED',
+				},
+			}
+
 		},
 		mysqldb: {
 			database: {
@@ -100,15 +128,23 @@ const config = convict({
 
 	credentials: {
 		overwrite: {
-			// Allows to set default values for credentials which
-			// get automatically prefilled and the user does not get
-			// displayed and can not change.
-			// Format: { CREDENTIAL_NAME: { PARAMTER: VALUE }}
-			doc: 'Overwrites for credentials',
-			format: '*',
-			default: '{}',
-			env: 'CREDENTIALS_OVERWRITE'
-		}
+			data: {
+				// Allows to set default values for credentials which
+				// get automatically prefilled and the user does not get
+				// displayed and can not change.
+				// Format: { CREDENTIAL_NAME: { PARAMTER: VALUE }}
+				doc: 'Overwrites for credentials',
+				format: '*',
+				default: '{}',
+				env: 'CREDENTIALS_OVERWRITE_DATA'
+			},
+			endpoint: {
+				doc: 'Fetch credentials from API',
+				format: String,
+				default: '',
+				env: 'CREDENTIALS_OVERWRITE_ENDPOINT',
+			},
+		},
 	},
 
 	executions: {
@@ -125,8 +161,8 @@ const config = convict({
 
 		// If a workflow executes all the data gets saved by default. This
 		// could be a problem when a workflow gets executed a lot and processes
-		// a lot of data. To not write the database full it is possible to
-		// not save the execution at all.
+		// a lot of data. To not exceed the database's capacity it is possible to
+		// prune the database regularly or to not save the execution at all.
 		// Depending on if the execution did succeed or error a different
 		// save behaviour can be set.
 		saveDataOnError: {
@@ -149,9 +185,34 @@ const config = convict({
 		// in the editor.
 		saveDataManualExecutions: {
 			doc: 'Save data of executions when started manually via editor',
+			format: 'Boolean',
 			default: false,
 			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS'
 		},
+
+		// To not exceed the database's capacity and keep its size moderate
+		// the execution data gets pruned regularly (default: 1 hour interval).
+		// All saved execution data older than the max age will be deleted.
+		// Pruning is currently not activated by default, which will change in
+		// a future version.
+		pruneData: {
+			doc: 'Delete data of past executions on a rolling basis',
+			format: 'Boolean',
+			default: false,
+			env: 'EXECUTIONS_DATA_PRUNE'
+		},
+		pruneDataMaxAge: {
+			doc: 'How old (hours) the execution data has to be to get deleted',
+			format: Number,
+			default: 336,
+			env: 'EXECUTIONS_DATA_MAX_AGE'
+		},
+		pruneDataTimeout: {
+			doc: 'Timeout (seconds) after execution data has been pruned',
+			format: Number,
+			default: 3600,
+			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT'
+		},
 	},
 
 	generic: {
@@ -168,6 +229,13 @@ const config = convict({
 	},
 
 	// How n8n can be reached (Editor & REST-API)
+	path: {
+		format: String,
+		default: '/',
+		arg: 'path',
+		env: 'N8N_PATH',
+		doc: 'Path n8n is deployed to'
+	},
 	host: {
 		format: String,
 		default: 'localhost',
@@ -271,6 +339,13 @@ const config = convict({
 		},
 	},
 
+	externalHookFiles: {
+		doc: 'Files containing external hooks. Multiple files can be separated by colon (":")',
+		format: String,
+		default: '',
+		env: 'EXTERNAL_HOOK_FILES'
+	},
+
 	nodes: {
 		exclude: {
 			doc: 'Nodes not to load',