Comparing version 2.2.3 to 2.3.0
@@ -27,7 +27,7 @@ 'use strict'; | ||
var cwd = _ref2.cwd, | ||
env = _ref2.env, | ||
optionEnv = _ref2.env, | ||
user = _ref2.user, | ||
group = _ref2.group; | ||
var _ref3, src, dest, preset, entry, data, error; | ||
var _ref3, src, dest, preset, entry, env, data, error; | ||
@@ -41,3 +41,3 @@ return _regenerator2.default.wrap(function _callee$(_context) { | ||
cwd: cwd, | ||
env: env | ||
env: optionEnv | ||
}).get(); | ||
@@ -51,10 +51,11 @@ | ||
entry = _ref3.entry; | ||
_context.next = 9; | ||
env = _ref3.env; | ||
_context.next = 10; | ||
return (0, _file.readYaml)(preset); | ||
case 9: | ||
case 10: | ||
data = _context.sent; | ||
if (!(!data.user && !user)) { | ||
_context.next = 13; | ||
_context.next = 14; | ||
break; | ||
@@ -66,3 +67,3 @@ } | ||
case 13: | ||
case 14: | ||
@@ -74,2 +75,4 @@ // cli user has higher priority | ||
data.env = env; | ||
return _context.abrupt('return', { | ||
@@ -83,3 +86,3 @@ src: src, | ||
case 15: | ||
case 17: | ||
case 'end': | ||
@@ -86,0 +89,0 @@ return _context.stop(); |
@@ -45,3 +45,3 @@ 'use strict'; | ||
this.cwd = _path2.default.resolve(cwd); | ||
this.env = env || undefined; | ||
this.env = env || undefined || DEFAULT_ENV; | ||
} | ||
@@ -240,3 +240,4 @@ | ||
// -> entry: nginx.conf | ||
entry: relativeEntry | ||
entry: relativeEntry, | ||
env: this.env | ||
}); | ||
@@ -283,3 +284,3 @@ | ||
if (Object(preset) === preset) { | ||
preset = preset[this.env || DEFAULT_ENV]; | ||
preset = preset[this.env]; | ||
@@ -286,0 +287,0 @@ if (!preset) { |
{ | ||
"name": "ngx", | ||
"version": "2.2.3", | ||
"version": "2.3.0", | ||
"description": "The Data-driven nginx configuration manager", | ||
@@ -5,0 +5,0 @@ "bin": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
180268
1697