yakuza0 2.23.11 → 2.23.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/index.js +5 -5
- package/package.json +1 -1
- package/server/proxy/web.js +5 -3
package/cli/index.js
CHANGED
|
@@ -377,10 +377,10 @@ var run = exports.run = function () {
|
|
|
377
377
|
switch (_context6.prev = _context6.next) {
|
|
378
378
|
case 0:
|
|
379
379
|
isTestInner = false;
|
|
380
|
-
// const {success: isTestInner} = connectionTester.test('fe-repo.inner.px.
|
|
380
|
+
// const {success: isTestInner} = connectionTester.test('fe-repo.inner.px.q7b.site', 5000, 1000)
|
|
381
381
|
|
|
382
382
|
try {
|
|
383
|
-
res = (0, _syncRequest2.default)('GET', 'https://sl.rdc.
|
|
383
|
+
res = (0, _syncRequest2.default)('GET', 'https://sl.rdc.q7b.site/sys/health-check', {
|
|
384
384
|
timeout: 1000
|
|
385
385
|
});
|
|
386
386
|
inner = JSON.parse(res.getBody('utf8'));
|
|
@@ -411,7 +411,7 @@ var run = exports.run = function () {
|
|
|
411
411
|
projectName = process.env.CLN_IMAGE_NAME || projectName;
|
|
412
412
|
imageReleaseName = projectName + ':' + CLNVERSION;
|
|
413
413
|
imageReleaseNameSave = (projectName + '_' + CLNVERSION).replace(/\//g, "_");
|
|
414
|
-
BI = process.env.CLN_IMAGE_BI || (isInner ? 'registry-image.rdc.
|
|
414
|
+
BI = process.env.CLN_IMAGE_BI || (isInner ? 'registry-image.rdc.q7b.site/cln-server:0.7.1' : 'nfjbill/cln-server:0.7.1');
|
|
415
415
|
preLoad = (process.env.CLN_IMAGE_LOAD || '').split(',');
|
|
416
416
|
// let BI = process.env.CLN_IMAGE_BI
|
|
417
417
|
|
|
@@ -432,7 +432,7 @@ var run = exports.run = function () {
|
|
|
432
432
|
|
|
433
433
|
if (DEP) {
|
|
434
434
|
Dockerfile = "Dockerfile_DEP";
|
|
435
|
-
BI = BI || "registry-image.rdc.
|
|
435
|
+
BI = BI || "registry-image.rdc.q7b.site/cln-server:0.7.0";
|
|
436
436
|
}
|
|
437
437
|
|
|
438
438
|
if (preLoad.length > 0) {
|
|
@@ -465,7 +465,7 @@ var run = exports.run = function () {
|
|
|
465
465
|
|
|
466
466
|
case 36:
|
|
467
467
|
if (!(0, _commandExists.sync)('pxnpm') && !DEP) {
|
|
468
|
-
execCmd(isInner ? 'npm i -g pxnpm --registry=https://registry-pxnpm.rdc.
|
|
468
|
+
execCmd(isInner ? 'npm i -g pxnpm --registry=https://registry-pxnpm.rdc.q7b.site' : 'npm i -g pxnpm');
|
|
469
469
|
}
|
|
470
470
|
if (!(0, _commandExists.sync)('cross-env') && !DEP) {
|
|
471
471
|
execCmd('pxnpm i -g cross-env');
|
package/package.json
CHANGED
package/server/proxy/web.js
CHANGED
|
@@ -76,9 +76,9 @@ var getCert = function getCert() {
|
|
|
76
76
|
key: '' + appAtSameDir + _config2.default.name.toLocaleString() + '.key'
|
|
77
77
|
};
|
|
78
78
|
var customImage = {
|
|
79
|
-
pfx: '/cert/st.
|
|
80
|
-
cert: '/cert/st.
|
|
81
|
-
key: '/cert/st.
|
|
79
|
+
pfx: '/cert/st.q7b.site.pfx',
|
|
80
|
+
cert: '/cert/st.q7b.site.pem',
|
|
81
|
+
key: '/cert/st.q7b.site.key'
|
|
82
82
|
};
|
|
83
83
|
if (access(custom.pfx)) {
|
|
84
84
|
return {
|
|
@@ -130,6 +130,7 @@ exports.default = function () {
|
|
|
130
130
|
if (local) {
|
|
131
131
|
app.use(function (ctx, next) {
|
|
132
132
|
return (0, _mid2.default)('/' + key, (0, _extends3.default)({}, defProxyOpt, {
|
|
133
|
+
changeOrigin: true,
|
|
133
134
|
target: _config2.default.server.orbProtocol.http + '//' + _config2.default.server.orbHost + ':' + _config2.default.server.orbPort + '/' + _config2.default.proxyServer.apiKey + '/' + _config2.default.name,
|
|
134
135
|
rewrite: function rewrite(path, ctx) {
|
|
135
136
|
var rsf = path.replace('/' + key + '/', '');
|
|
@@ -284,6 +285,7 @@ exports.default = function () {
|
|
|
284
285
|
// })
|
|
285
286
|
// }
|
|
286
287
|
}
|
|
288
|
+
|
|
287
289
|
if (!_config2.default.security.isStupid && proxyReq.host) {
|
|
288
290
|
proxyReq.setHeader('host', proxyReq.host);
|
|
289
291
|
}
|