yakuza0 2.22.34-beta.2 → 2.22.34-beta.4
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/package.json +1 -1
- package/server/proxy/conf.js +1 -1
- package/server/proxy/tire.js +4 -3
package/package.json
CHANGED
package/server/proxy/conf.js
CHANGED
|
@@ -204,5 +204,5 @@ var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
|
|
|
204
204
|
resolver = 'resolver ' + _server._.trimEnd(resolver, ';') + ';';
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
-
return '\n ' + resolver + '\n\n server {\n listen ' + port + ';\n server_name
|
|
207
|
+
return '\n ' + resolver + '\n\n server {\n listen ' + port + ';\n server_name cln-tire.lan;\n include ' + confRoot + '/server.conf;\n\n location ' + basePath + ' {\n proxy_pass ' + appUrl + ';\n }\n\n location ' + basePath + 'apiv1 {\n proxy_set_header ' + _def.variable.ipHeader + ' \'' + th[_def.variable.ipHeader] + '\';\n proxy_set_header ' + _def.variable.childKeyHeader + ' \'' + th[_def.variable.childKeyHeader] + '\';\n proxy_set_header ' + _def.variable.appCodeHeader + ' \'' + th[_def.variable.appCodeHeader] + '\';\n proxy_set_header ' + _def.variable.appKeyHeader + ' \'' + th[_def.variable.appKeyHeader] + '\';\n proxy_set_header ' + _def.variable.shareRuleHeader + ' \'' + th[_def.variable.shareRuleHeader] + '\';\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/backend;\n }\n\n location ' + basePath + 'apiv2 {\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv2;\n }\n\n location ~ ' + basePath + 'apiv3/cln_.*feapiv1/ {\n rewrite ^' + basePath + 'apiv3/cln_(.*)feapiv1/(.*)$ ' + basePath + 'apiv3/fe/$2 last;\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + ';\n }\n location ~ ' + basePath + 'apiv3/cln_[a-z]+/ {\n rewrite ^' + basePath + 'apiv3/cln_[a-z]+/(.*)$ ' + basePath + 'apiv3/backend/$1 last;\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + ';\n }\n }\n ';
|
|
208
208
|
};
|
package/server/proxy/tire.js
CHANGED
|
@@ -463,12 +463,13 @@ exports.default = function () {
|
|
|
463
463
|
});
|
|
464
464
|
|
|
465
465
|
_paths2.default.write(_config2.default.server.tire.clnConf, conf);
|
|
466
|
-
// spawn(yConf.server.tire.guPath, ['-c', yConf.server.tire.guConf]);
|
|
467
466
|
|
|
468
467
|
try {
|
|
469
|
-
|
|
468
|
+
// exec(yConf.server.tire.guPath + ' -s stop');
|
|
469
|
+
(0, _child_process.spawn)(_config2.default.server.tire.guPath, ['-s', 'stop']);
|
|
470
470
|
} catch (e) {}
|
|
471
|
-
|
|
471
|
+
// exec(yConf.server.tire.guPath + ' -c ' + yConf.server.tire.guConf + ' -g "daemon off;"');
|
|
472
|
+
(0, _child_process.spawn)(_config2.default.server.tire.guPath, ['-c', _config2.default.server.tire.guConf]);
|
|
472
473
|
} else {
|
|
473
474
|
app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|
|
474
475
|
target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
|