mirror of
				https://github.com/therootcompany/greenlock.js.git
				synced 2024-11-16 17:29:00 +00:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f01286d5b1 | |||
| aea967e210 | |||
| 89e2fec39f | |||
|  | 1a60d53c32 | 
| @ -83,7 +83,8 @@ Certificates are renewed every 45 days by default, and renewal checks will happe | |||||||
| var pkg = require('./package.json'); | var pkg = require('./package.json'); | ||||||
| var Greenlock = require('greenlock'); | var Greenlock = require('greenlock'); | ||||||
| var greenlock = Greenlock.create({ | var greenlock = Greenlock.create({ | ||||||
|     configDir: './greenlock.d/config.json', |     packageRoot: __dirname, | ||||||
|  |     configDir: "./greenlock.d/", | ||||||
|     packageAgent: pkg.name + '/' + pkg.version, |     packageAgent: pkg.name + '/' + pkg.version, | ||||||
|     maintainerEmail: pkg.author, |     maintainerEmail: pkg.author, | ||||||
|     staging: true, |     staging: true, | ||||||
| @ -177,7 +178,7 @@ Creates an instance of greenlock with _environment_-level values. | |||||||
| 
 | 
 | ||||||
| var pkg = require('./package.json'); | var pkg = require('./package.json'); | ||||||
| var gl = Greenlock.create({ | var gl = Greenlock.create({ | ||||||
|     configDir: './greenlock.d/config.json', |     configDir: './greenlock.d/', | ||||||
| 
 | 
 | ||||||
|     // Staging for testing environments |     // Staging for testing environments | ||||||
|     staging: true, |     staging: true, | ||||||
|  | |||||||
| @ -124,7 +124,6 @@ Init._init = function(opts) { | |||||||
|         ); |         ); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     //var mkdirp = promisify(require("@root/mkdirp"));
 |  | ||||||
|     opts.configFile = path.join( |     opts.configFile = path.join( | ||||||
|         path.resolve(opts.packageRoot, opts.configDir), |         path.resolve(opts.packageRoot, opts.configDir), | ||||||
|         'config.json' |         'config.json' | ||||||
|  | |||||||
							
								
								
									
										32
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										32
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|     "name": "@root/greenlock", |     "name": "@root/greenlock", | ||||||
|     "version": "4.0.4", |     "version": "4.0.5", | ||||||
|     "lockfileVersion": 1, |     "lockfileVersion": 1, | ||||||
|     "requires": true, |     "requires": true, | ||||||
|     "dependencies": { |     "dependencies": { | ||||||
| @ -24,15 +24,23 @@ | |||||||
|             } |             } | ||||||
|         }, |         }, | ||||||
|         "@root/acme": { |         "@root/acme": { | ||||||
|             "version": "3.0.9", |             "version": "3.1.0", | ||||||
|             "resolved": "https://registry.npmjs.org/@root/acme/-/acme-3.0.9.tgz", |             "resolved": "https://registry.npmjs.org/@root/acme/-/acme-3.1.0.tgz", | ||||||
|             "integrity": "sha512-/FgJF6RUrkqNpLmxqjktHaWMsLOwma6D+e4EBoxKtTjTAI+dBqW8Z8cH38feUsiIBR5LimPeYmBo/oqU3oMkKQ==", |             "integrity": "sha512-GAyaW63cpSYd2KvVp5lHLbCWeEhJPKZK9nsJvZJOKsD9Uv88KEttn4FpDZEJ+2q3Jsey0DWpuQ2I4ft0JV9p2w==", | ||||||
|             "requires": { |             "requires": { | ||||||
|  |                 "@root/csr": "^0.8.1", | ||||||
|                 "@root/encoding": "^1.0.1", |                 "@root/encoding": "^1.0.1", | ||||||
|                 "@root/keypairs": "^0.9.0", |                 "@root/keypairs": "^0.10.0", | ||||||
|                 "@root/pem": "^1.0.4", |                 "@root/pem": "^1.0.4", | ||||||
|                 "@root/request": "^1.3.11", |                 "@root/request": "^1.6.1", | ||||||
|                 "@root/x509": "^0.7.2" |                 "@root/x509": "^0.7.2" | ||||||
|  |             }, | ||||||
|  |             "dependencies": { | ||||||
|  |                 "@root/request": { | ||||||
|  |                     "version": "1.6.1", | ||||||
|  |                     "resolved": "https://registry.npmjs.org/@root/request/-/request-1.6.1.tgz", | ||||||
|  |                     "integrity": "sha512-8wrWyeBLRp7T8J36GkT3RODJ6zYmL0/maWlAUD5LOXT28D3TDquUepyYDKYANNA3Gc8R5ZCgf+AXvSTYpJEWwQ==" | ||||||
|  |                 } | ||||||
|             } |             } | ||||||
|         }, |         }, | ||||||
|         "@root/asn1": { |         "@root/asn1": { | ||||||
| @ -59,9 +67,9 @@ | |||||||
|             "integrity": "sha512-OaEub02ufoU038gy6bsNHQOjIn8nUjGiLcaRmJ40IUykneJkIW5fxDqKxQx48cszuNflYldsJLPPXCrGfHs8yQ==" |             "integrity": "sha512-OaEub02ufoU038gy6bsNHQOjIn8nUjGiLcaRmJ40IUykneJkIW5fxDqKxQx48cszuNflYldsJLPPXCrGfHs8yQ==" | ||||||
|         }, |         }, | ||||||
|         "@root/keypairs": { |         "@root/keypairs": { | ||||||
|             "version": "0.9.0", |             "version": "0.10.0", | ||||||
|             "resolved": "https://registry.npmjs.org/@root/keypairs/-/keypairs-0.9.0.tgz", |             "resolved": "https://registry.npmjs.org/@root/keypairs/-/keypairs-0.10.0.tgz", | ||||||
|             "integrity": "sha512-NXE2L9Gv7r3iC4kB/gTPZE1vO9Ox/p14zDzAJ5cGpTpytbWOlWF7QoHSJbtVX4H7mRG/Hp7HR3jWdWdb2xaaXg==", |             "integrity": "sha512-t8VocY46Mtb0NTsxzyLLf5tsgfw0BXLYVADAyiRdEdqHcvPFGJdjkXNtHVQuSV/FMaC65iTOHVP4E6X8iT3Ikg==", | ||||||
|             "requires": { |             "requires": { | ||||||
|                 "@root/encoding": "^1.0.1", |                 "@root/encoding": "^1.0.1", | ||||||
|                 "@root/pem": "^1.0.4", |                 "@root/pem": "^1.0.4", | ||||||
| @ -79,9 +87,9 @@ | |||||||
|             "integrity": "sha512-rEUDiUsHtild8GfIjFE9wXtcVxeS+ehCJQBwbQQ3IVfORKHK93CFnRtkr69R75lZFjcmKYVc+AXDB+AeRFOULA==" |             "integrity": "sha512-rEUDiUsHtild8GfIjFE9wXtcVxeS+ehCJQBwbQQ3IVfORKHK93CFnRtkr69R75lZFjcmKYVc+AXDB+AeRFOULA==" | ||||||
|         }, |         }, | ||||||
|         "@root/request": { |         "@root/request": { | ||||||
|             "version": "1.4.2", |             "version": "1.6.1", | ||||||
|             "resolved": "https://registry.npmjs.org/@root/request/-/request-1.4.2.tgz", |             "resolved": "https://registry.npmjs.org/@root/request/-/request-1.6.1.tgz", | ||||||
|             "integrity": "sha512-J8FM4+SJuc7WRC+Jz17m+VT2lgI7HtatHhxN1F2ck5aIKUAxJEaR4u/gLBsgT60mVHevKCjKN0O8115UtJjwLw==" |             "integrity": "sha512-8wrWyeBLRp7T8J36GkT3RODJ6zYmL0/maWlAUD5LOXT28D3TDquUepyYDKYANNA3Gc8R5ZCgf+AXvSTYpJEWwQ==" | ||||||
|         }, |         }, | ||||||
|         "@root/x509": { |         "@root/x509": { | ||||||
|             "version": "0.7.2", |             "version": "0.7.2", | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
|     "name": "@root/greenlock", |     "name": "@root/greenlock", | ||||||
|     "version": "4.0.4", |     "version": "4.0.5", | ||||||
|     "description": "The easiest Let's Encrypt client for Node.js and Browsers", |     "description": "The easiest Let's Encrypt client for Node.js and Browsers", | ||||||
|     "homepage": "https://rootprojects.org/greenlock/", |     "homepage": "https://rootprojects.org/greenlock/", | ||||||
|     "main": "greenlock.js", |     "main": "greenlock.js", | ||||||
| @ -39,11 +39,11 @@ | |||||||
|     "license": "MPL-2.0", |     "license": "MPL-2.0", | ||||||
|     "dependencies": { |     "dependencies": { | ||||||
|         "@greenlock/manager": "^3.1.0", |         "@greenlock/manager": "^3.1.0", | ||||||
|         "@root/acme": "^3.0.9", |         "@root/acme": "^3.1.0", | ||||||
|         "@root/csr": "^0.8.1", |         "@root/csr": "^0.8.1", | ||||||
|         "@root/keypairs": "^0.9.0", |         "@root/keypairs": "^0.10.0", | ||||||
|         "@root/mkdirp": "^1.0.0", |         "@root/mkdirp": "^1.0.0", | ||||||
|         "@root/request": "^1.4.2", |         "@root/request": "^1.6.1", | ||||||
|         "acme-http-01-standalone": "^3.0.5", |         "acme-http-01-standalone": "^3.0.5", | ||||||
|         "cert-info": "^1.5.1", |         "cert-info": "^1.5.1", | ||||||
|         "greenlock-store-fs": "^3.2.2", |         "greenlock-store-fs": "^3.2.2", | ||||||
|  | |||||||
| @ -146,7 +146,7 @@ P._normalizeChallenge = function(name, ch) { | |||||||
|         }; |         }; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     // init, zones, set, get, remove
 |     // init, zones, set, get, remove, propagationDelay
 | ||||||
|     if (ch.init) { |     if (ch.init) { | ||||||
|         if (2 === ch.init.length) { |         if (2 === ch.init.length) { | ||||||
|             warn(); |             warn(); | ||||||
| @ -183,6 +183,9 @@ P._normalizeChallenge = function(name, ch) { | |||||||
|         } |         } | ||||||
|         gch.get = wrappy(ch.get); |         gch.get = wrappy(ch.get); | ||||||
|     } |     } | ||||||
|  |     if("number" === typeof ch.propagationDelay) { | ||||||
|  |         gch.propagationDelay = ch.propagationDelay; | ||||||
|  |     } | ||||||
| 
 | 
 | ||||||
|     return gch; |     return gch; | ||||||
| }; | }; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user