mirror of
				https://github.com/therootcompany/greenlock.js.git
				synced 2024-11-16 17:29:00 +00:00 
			
		
		
		
	v2.7.17: dep updates and argument addition for v3
This commit is contained in:
		
							parent
							
								
									0d14db1f1c
								
							
						
					
					
						commit
						e29d237a2d
					
				
							
								
								
									
										11
									
								
								index.js
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								index.js
									
									
									
									
									
								
							@ -1,5 +1,9 @@
 | 
				
			|||||||
'use strict';
 | 
					'use strict';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// I hate this code so much.
 | 
				
			||||||
 | 
					// Soooo many shims for backwards compatibility (some stuff dating back to v1)
 | 
				
			||||||
 | 
					// v3 will be a clean break and I'll delete half of the code...
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var DAY = 24 * 60 * 60 * 1000;
 | 
					var DAY = 24 * 60 * 60 * 1000;
 | 
				
			||||||
//var MIN = 60 * 1000;
 | 
					//var MIN = 60 * 1000;
 | 
				
			||||||
var ACME = require('acme-v2/compat').ACME;
 | 
					var ACME = require('acme-v2/compat').ACME;
 | 
				
			||||||
@ -109,8 +113,8 @@ Greenlock._undefine = function (gl) {
 | 
				
			|||||||
Greenlock.create = function (gl) {
 | 
					Greenlock.create = function (gl) {
 | 
				
			||||||
  if (!gl.store) {
 | 
					  if (!gl.store) {
 | 
				
			||||||
    console.warn("Deprecation Notice: You're haven't chosen a storage strategy."
 | 
					    console.warn("Deprecation Notice: You're haven't chosen a storage strategy."
 | 
				
			||||||
      + " The old default is 'le-store-certbot', but the new default will be 'le-store-fs'."
 | 
					      + " The old default is 'le-store-certbot', but the new default will be 'greenlock-store-fs'."
 | 
				
			||||||
      + " Please explicitly set `{ store: require('le-store-fs') }`.");
 | 
					      + " Please `npm install greenlock-store-fs@3` and explicitly set `{ store: require('greenlock-store-fs') }`.");
 | 
				
			||||||
    gl.store = require('le-store-certbot').create({
 | 
					    gl.store = require('le-store-certbot').create({
 | 
				
			||||||
      debug: gl.debug
 | 
					      debug: gl.debug
 | 
				
			||||||
    , configDir: gl.configDir
 | 
					    , configDir: gl.configDir
 | 
				
			||||||
@ -304,7 +308,7 @@ Greenlock.create = function (gl) {
 | 
				
			|||||||
  } catch(e) {
 | 
					  } catch(e) {
 | 
				
			||||||
    console.error(e);
 | 
					    console.error(e);
 | 
				
			||||||
    console.error("\nPROBABLE CAUSE:\n"
 | 
					    console.error("\nPROBABLE CAUSE:\n"
 | 
				
			||||||
      + "\tYour le-store module should have a create function and return { options, accounts, certificates }\n");
 | 
					      + "\tYour greenlock-store module should have a create function and return { options, accounts, certificates }\n");
 | 
				
			||||||
    process.exit(18);
 | 
					    process.exit(18);
 | 
				
			||||||
    return;
 | 
					    return;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
@ -479,6 +483,7 @@ Greenlock.create = function (gl) {
 | 
				
			|||||||
          if (Array.isArray(options.altnames) && options.altnames.length) {
 | 
					          if (Array.isArray(options.altnames) && options.altnames.length) {
 | 
				
			||||||
            options.domains = options.altnames;
 | 
					            options.domains = options.altnames;
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
 | 
					          options.altnames = options.domains;
 | 
				
			||||||
          // just in case we get a completely different object from the one we originally created
 | 
					          // just in case we get a completely different object from the one we originally created
 | 
				
			||||||
          if (!options.account) { options.account = {}; }
 | 
					          if (!options.account) { options.account = {}; }
 | 
				
			||||||
          if (!options.certificate) { options.certificate = {}; }
 | 
					          if (!options.certificate) { options.certificate = {}; }
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										30
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										30
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "greenlock",
 | 
					  "name": "greenlock",
 | 
				
			||||||
  "version": "2.7.15",
 | 
					  "version": "2.7.16",
 | 
				
			||||||
  "lockfileVersion": 1,
 | 
					  "lockfileVersion": 1,
 | 
				
			||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
@ -36,6 +36,20 @@
 | 
				
			|||||||
      "resolved": "https://registry.npmjs.org/eckles/-/eckles-1.4.1.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/eckles/-/eckles-1.4.1.tgz",
 | 
				
			||||||
      "integrity": "sha512-auWyk/k8oSkVHaD4RxkPadKsLUcIwKgr/h8F7UZEueFDBO7BsE4y+H6IMUDbfqKIFPg/9MxV6KcBdJCmVVcxSA=="
 | 
					      "integrity": "sha512-auWyk/k8oSkVHaD4RxkPadKsLUcIwKgr/h8F7UZEueFDBO7BsE4y+H6IMUDbfqKIFPg/9MxV6KcBdJCmVVcxSA=="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "greenlock-challenge-dns": {
 | 
				
			||||||
 | 
					      "version": "3.0.4",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/greenlock-challenge-dns/-/greenlock-challenge-dns-3.0.4.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-CJI9RAtrZl9ICldyU5cRGzb1/wIbS3O+MJy9z7gKb7fLDNF7Wmw9Fv2agBLSOtIPr7TYgyyesvt8ppA4OIS+yg=="
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "greenlock-store-fs": {
 | 
				
			||||||
 | 
					      "version": "3.0.0",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/greenlock-store-fs/-/greenlock-store-fs-3.0.0.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-LngMK+RAR+puo53pmqzcSrKinqcYwAKQGyvILuLDJXA4KJ+IUUfqk/GW2J0VDArw3iIsZkTxgXDwoIGCteO6oA==",
 | 
				
			||||||
 | 
					      "requires": {
 | 
				
			||||||
 | 
					        "mkdirp": "^0.5.1",
 | 
				
			||||||
 | 
					        "safe-replace": "^1.1.0"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "keypairs": {
 | 
					    "keypairs": {
 | 
				
			||||||
      "version": "1.2.14",
 | 
					      "version": "1.2.14",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/keypairs/-/keypairs-1.2.14.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/keypairs/-/keypairs-1.2.14.tgz",
 | 
				
			||||||
@ -45,11 +59,6 @@
 | 
				
			|||||||
        "rasha": "^1.2.4"
 | 
					        "rasha": "^1.2.4"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "le-challenge-dns": {
 | 
					 | 
				
			||||||
      "version": "3.0.3",
 | 
					 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/le-challenge-dns/-/le-challenge-dns-3.0.3.tgz",
 | 
					 | 
				
			||||||
      "integrity": "sha512-6jz9YMpWhTXJKK+Id/S0j8R3oEiH6ya5WBTPzc7GsNR21voesejP7UJaDcdH9GQrjf7gBX3xyr4BlL/GplNBOw=="
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "le-challenge-fs": {
 | 
					    "le-challenge-fs": {
 | 
				
			||||||
      "version": "2.0.8",
 | 
					      "version": "2.0.8",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/le-challenge-fs/-/le-challenge-fs-2.0.8.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/le-challenge-fs/-/le-challenge-fs-2.0.8.tgz",
 | 
				
			||||||
@ -73,15 +82,6 @@
 | 
				
			|||||||
        "safe-replace": "^1.0.3"
 | 
					        "safe-replace": "^1.0.3"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "le-store-fs": {
 | 
					 | 
				
			||||||
      "version": "1.0.3",
 | 
					 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/le-store-fs/-/le-store-fs-1.0.3.tgz",
 | 
					 | 
				
			||||||
      "integrity": "sha512-JdnYvfBiJwgjNFQ55Qw5bgWd+MsnE466AgBMWw6dMzORTQ0F2a35u0l8VvZ9qRBeSoAv6Kt/y5saATzjNltcqQ==",
 | 
					 | 
				
			||||||
      "requires": {
 | 
					 | 
				
			||||||
        "mkdirp": "^0.5.1",
 | 
					 | 
				
			||||||
        "safe-replace": "^1.1.0"
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "minimist": {
 | 
					    "minimist": {
 | 
				
			||||||
      "version": "0.0.8",
 | 
					      "version": "0.0.8",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "greenlock",
 | 
					  "name": "greenlock",
 | 
				
			||||||
  "version": "2.7.16",
 | 
					  "version": "2.7.17",
 | 
				
			||||||
  "description": "Let's Encrypt for node.js on npm",
 | 
					  "description": "Let's Encrypt for node.js on npm",
 | 
				
			||||||
  "main": "index.js",
 | 
					  "main": "index.js",
 | 
				
			||||||
  "files": [
 | 
					  "files": [
 | 
				
			||||||
@ -42,11 +42,11 @@
 | 
				
			|||||||
    "acme-v2": "^1.7.7",
 | 
					    "acme-v2": "^1.7.7",
 | 
				
			||||||
    "cert-info": "^1.5.1",
 | 
					    "cert-info": "^1.5.1",
 | 
				
			||||||
    "keypairs": "^1.2.14",
 | 
					    "keypairs": "^1.2.14",
 | 
				
			||||||
    "le-challenge-dns": "^3.0.3",
 | 
					    "greenlock-challenge-dns": "^3.0.0",
 | 
				
			||||||
    "le-challenge-fs": "^2.0.2",
 | 
					    "le-challenge-fs": "^2.0.2",
 | 
				
			||||||
    "le-sni-auto": "^2.1.8",
 | 
					    "le-sni-auto": "^2.1.8",
 | 
				
			||||||
    "le-store-certbot": "^2.2.2",
 | 
					    "le-store-certbot": "^2.2.2",
 | 
				
			||||||
    "le-store-fs": "^1.0.3",
 | 
					    "greenlock-store-fs": "^3.0.0",
 | 
				
			||||||
    "rsa-compat": "^2.0.6"
 | 
					    "rsa-compat": "^2.0.6"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "engines": {
 | 
					  "engines": {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user