From 754ace5cb437122e97981718b4ad01a04f399401 Mon Sep 17 00:00:00 2001 From: tigerbot Date: Tue, 17 Oct 2017 12:56:25 -0600 Subject: [PATCH] removed arguments that populate a deprecated config --- bin/goldilocks.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/bin/goldilocks.js b/bin/goldilocks.js index 06a340b..2278d8f 100755 --- a/bin/goldilocks.js +++ b/bin/goldilocks.js @@ -339,15 +339,6 @@ function fillConfig(config, args) { fillComponent('http', false); fillComponent('tls', false); - if (!config.tls.acme && (args.email || args.agreeTos)) { - config.tls.acme = {}; - } - if (typeof args.agreeTos === 'string') { - config.tls.acme.approvedDomains = args.agreeTos.split(','); - } - if (args.email) { - config.tls.acme.email = args.email; - } config.device = { hostname: require('os').hostname() }; config.tunnel = args.tunnel || config.tunnel; @@ -452,7 +443,6 @@ function readEnv(args) { var env = { tunnel: process.env.GOLDILOCKS_TUNNEL_TOKEN || process.env.GOLDILOCKS_TUNNEL && true - , email: process.env.GOLDILOCKS_EMAIL , cwd: process.env.GOLDILOCKS_HOME || process.cwd() , debug: process.env.GOLDILOCKS_DEBUG && true }; @@ -464,10 +454,8 @@ var program = require('commander'); program .version(require('../package.json').version) - .option('--agree-tos [url1,url2]', "agree to all Terms of Service for Daplie, Let's Encrypt, etc (or specific URLs only)") .option('-c --config ', 'Path to config file (Goldilocks.json or Goldilocks.yml) example: --config /etc/goldilocks/Goldilocks.json') .option('--tunnel [token]', 'Turn tunnel on. This will enter interactive mode for login if no token is specified.') - .option('--email ', "(Re)set default email to use for Daplie, Let's Encrypt, ACME, etc.") .option('--debug', "Enable debug output") .parse(process.argv);