From d8ee4e32499bad68d4f920ff95d5e9b58a4ec3fa Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@linux.com>
Date: Sat, 31 Oct 2020 20:33:13 +0800
Subject: [PATCH] config: clarify the env variable option

---
 config.cli.js | 9 ++++++++-
 config.d.ts   | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config.cli.js b/config.cli.js
index 5eb07add..b62ad909 100644
--- a/config.cli.js
+++ b/config.cli.js
@@ -207,6 +207,13 @@ if (argv.noauth || argv.auth === 'none') {
   authMethod = 'none';
 }
 
+let allowedPaths = [];
+if (typeof argv.allowedpath === 'string') {
+  allowedPaths = allowedPaths.concat(argv.allowedpath.split(','));
+} else if (Array.isArray(argv.allowedpath)) {
+  allowedPaths = allowedPaths.concat(argv.allowedpath);
+}
+
 const CONFIG = {
   baseURI: argv.baseuri,
   dbCleanInterval: argv.dbclean,
@@ -224,7 +231,7 @@ const CONFIG = {
   ssl: argv.ssl,
   sslKey: argv.sslkey || path.resolve(path.join(argv.rundir, 'key.pem')),
   sslCert: argv.sslcert || path.resolve(path.join(argv.rundir, 'fullchain.pem')),
-  allowedPaths: argv.allowedpath ? [].concat(argv.allowedpath) : undefined,
+  allowedPaths: allowedPaths.length > 0 ? allowedPaths : undefined,
 };
 
 module.exports = CONFIG;
diff --git a/config.d.ts b/config.d.ts
index eb9dbd76..e663949e 100644
--- a/config.d.ts
+++ b/config.d.ts
@@ -10,6 +10,9 @@
 // Plus, such duplications and conditionals are error-prone.
 //
 // Use CLI if you don't want to check and change the config.js whenever Flood is updated.
+// CLI also supports passing through arguments via environment variables. For example,
+// env variable FLOOD_OPTION_port=80 is equivalent to argument --port 80. Use ',' to split
+// for arguments that take multiple inputs such as --allowedpath.
 
 import type {AuthMethod} from '@shared/schema/Auth';
 import type {ClientConnectionSettings} from '@shared/schema/ClientConnectionSettings';