mirror of
				https://github.com/therootcompany/greenlock.js.git
				synced 2024-11-16 17:29:00 +00:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			d6c7da17d8
			...
			fcafde98be
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fcafde98be | |||
| 9ea7961bb6 | 
							
								
								
									
										17
									
								
								greenlock.js
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								greenlock.js
									
									
									
									
									
								
							@ -405,7 +405,8 @@ G.create = function(gconf) {
 | 
				
			|||||||
            showDir = true;
 | 
					            showDir = true;
 | 
				
			||||||
            dirUrl = greenlock._defaults.directoryUrl;
 | 
					            dirUrl = greenlock._defaults.directoryUrl;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (showDir || /staging/.test(dirUrl)) {
 | 
					        if (showDir || (/staging/.test(dirUrl) && !gdefaults.shownDirectory)) {
 | 
				
			||||||
 | 
					            gdefaults.shownDirectory = true;
 | 
				
			||||||
            console.info('ACME Directory URL:', gdefaults.directoryUrl);
 | 
					            console.info('ACME Directory URL:', gdefaults.directoryUrl);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -446,13 +447,15 @@ G.create = function(gconf) {
 | 
				
			|||||||
            var storeConf = siteConf.store || mconf.store;
 | 
					            var storeConf = siteConf.store || mconf.store;
 | 
				
			||||||
            storeConf = JSON.parse(JSON.stringify(storeConf));
 | 
					            storeConf = JSON.parse(JSON.stringify(storeConf));
 | 
				
			||||||
            storeConf.packageRoot = gconf.packageRoot;
 | 
					            storeConf.packageRoot = gconf.packageRoot;
 | 
				
			||||||
            if (storeConf.basePath) {
 | 
					
 | 
				
			||||||
                var path = require('path');
 | 
					            var path = require('path');
 | 
				
			||||||
                storeConf.basePath = path.resolve(
 | 
					            if (!storeConf.basePath) {
 | 
				
			||||||
                    gconf.packageRoot || process.cwd(),
 | 
					                storeConf.basePath = 'greenlock';
 | 
				
			||||||
                    'greenlock'
 | 
					 | 
				
			||||||
                );
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            storeConf.basePath = path.resolve(
 | 
				
			||||||
 | 
					                gconf.packageRoot || process.cwd(),
 | 
				
			||||||
 | 
					                storeConf.basePath
 | 
				
			||||||
 | 
					            );
 | 
				
			||||||
            return P._loadStore(storeConf).then(function(store) {
 | 
					            return P._loadStore(storeConf).then(function(store) {
 | 
				
			||||||
                return A._getOrCreate(
 | 
					                return A._getOrCreate(
 | 
				
			||||||
                    greenlock,
 | 
					                    greenlock,
 | 
				
			||||||
 | 
				
			|||||||
@ -162,7 +162,7 @@ module.exports._read = function(pkgdir) {
 | 
				
			|||||||
            throw err;
 | 
					            throw err;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
            require(path.join(pkgdir, 'package.json'));
 | 
					            require(path.resolve(path.join(pkgdir, './package.json')));
 | 
				
			||||||
        } catch (e) {
 | 
					        } catch (e) {
 | 
				
			||||||
            e.context = 'package.json';
 | 
					            e.context = 'package.json';
 | 
				
			||||||
            e.desc =
 | 
					            e.desc =
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "name": "@root/greenlock",
 | 
					    "name": "@root/greenlock",
 | 
				
			||||||
    "version": "3.1.3",
 | 
					    "version": "3.1.4",
 | 
				
			||||||
    "lockfileVersion": 1,
 | 
					    "lockfileVersion": 1,
 | 
				
			||||||
    "requires": true,
 | 
					    "requires": true,
 | 
				
			||||||
    "dependencies": {
 | 
					    "dependencies": {
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    "name": "@root/greenlock",
 | 
					    "name": "@root/greenlock",
 | 
				
			||||||
    "version": "3.1.3",
 | 
					    "version": "3.1.4",
 | 
				
			||||||
    "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",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user