From 0bbe157099996db930294893207bad3f71ea3fae Mon Sep 17 00:00:00 2001 From: Marc Harnos Date: Sat, 8 Jan 2022 14:36:33 +0100 Subject: [PATCH] change parsing priority for all passed arguments update all passed args in server.js to prioritize command line, then use env.UPTIME_KUMA_ environment variables, then use the generic environment variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall back to default values where applicable --- server/server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/server.js b/server/server.js index 6b822a3de..d3f2b20a5 100644 --- a/server/server.js +++ b/server/server.js @@ -65,20 +65,20 @@ console.info("Version: " + checkVersion.version); // Dual-stack support for (::) // Also read HOST if not FreeBSD, as HOST is a system environment variable in FreeBSD let hostEnv = FBSD ? null : process.env.HOST; -let hostname = process.env.UPTIME_KUMA_HOST || args.host || hostEnv; +let hostname = args.host || process.env.UPTIME_KUMA_HOST || hostEnv; if (hostname) { console.log("Custom hostname: " + hostname); } -const port = [process.env.UPTIME_KUMA_PORT, process.env.PORT, args.port, 3001] +const port = [args.port, process.env.UPTIME_KUMA_PORT, process.env.PORT, 3001] .map(portValue => parseInt(portValue)) .find(portValue => !isNaN(portValue)); // SSL -const sslKey = process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || args["ssl-key"] || undefined; -const sslCert = process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || args["ssl-cert"] || undefined; -const disableFrameSameOrigin = !!process.env.UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN || args["disable-frame-sameorigin"] || false; +const sslKey = args["ssl-key"] || process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || undefined; +const sslCert = args["ssl-cert"] || process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined; +const disableFrameSameOrigin = args["disable-frame-sameorigin"] || !!process.env.UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN || false; // 2FA / notp verification defaults const twofa_verification_opts = {