@lilaquadrat/studio 2.4.9 → 2.4.12
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/lib/interfaces.d.ts +5 -1
- package/lib/interfaces.d.ts.map +1 -1
- package/lib/interfaces.js.map +1 -1
- package/lib/models.d.ts +2 -1
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +3 -1
- package/lib/models.js.map +1 -1
- package/lib/services.d.ts +3 -1
- package/lib/services.d.ts.map +1 -1
- package/lib/services.js +6 -2
- package/lib/services.js.map +1 -1
- package/lib/src/AzureFileStorage.share.d.ts +7 -1
- package/lib/src/AzureFileStorage.share.d.ts.map +1 -1
- package/lib/src/AzureFileStorage.share.js +51 -22
- package/lib/src/AzureFileStorage.share.js.map +1 -1
- package/lib/src/classes/ControllerBase.class.js +2 -2
- package/lib/src/classes/ControllerBase.class.js.map +1 -1
- package/lib/src/classes/models.class.js +1 -1
- package/lib/src/classes/models.class.js.map +1 -1
- package/lib/src/docker-compose.class.js +2 -2
- package/lib/src/docker-compose.class.js.map +1 -1
- package/lib/src/helpers/companyRights.js +2 -2
- package/lib/src/helpers/companyRights.js.map +1 -1
- package/lib/src/interfaces/DomainConf.interface.d.ts +2 -1
- package/lib/src/interfaces/DomainConf.interface.d.ts.map +1 -1
- package/lib/src/logger.js +2 -2
- package/lib/src/logger.js.map +1 -1
- package/lib/src/models/certificate-action.model.d.ts +1 -0
- package/lib/src/models/certificate-action.model.d.ts.map +1 -1
- package/lib/src/models/certificate-action.model.js.map +1 -1
- package/lib/src/models/domain.model.d.ts +1 -1
- package/lib/src/models/domain.model.d.ts.map +1 -1
- package/lib/src/models/domain.model.js +3 -2
- package/lib/src/models/domain.model.js.map +1 -1
- package/lib/src/models/hosting.model.d.ts.map +1 -1
- package/lib/src/models/hosting.model.js +15 -0
- package/lib/src/models/hosting.model.js.map +1 -1
- package/lib/src/models/hostingCommand.model.d.ts +21 -0
- package/lib/src/models/hostingCommand.model.d.ts.map +1 -0
- package/lib/src/models/hostingCommand.model.js +22 -0
- package/lib/src/models/hostingCommand.model.js.map +1 -0
- package/lib/src/models/permissions.model.d.ts.map +1 -1
- package/lib/src/models/permissions.model.js +2 -1
- package/lib/src/models/permissions.model.js.map +1 -1
- package/lib/src/models/publish-method.model.d.ts +5 -1
- package/lib/src/models/publish-method.model.d.ts.map +1 -1
- package/lib/src/models/publish-method.model.js +54 -0
- package/lib/src/models/publish-method.model.js.map +1 -1
- package/lib/src/nginx.class.js +1 -1
- package/lib/src/nginx.class.js.map +1 -1
- package/lib/src/prepareContent.js +6 -6
- package/lib/src/prepareContent.js.map +1 -1
- package/lib/src/services/certificates.service.js +1 -1
- package/lib/src/services/certificates.service.js.map +1 -1
- package/lib/src/services/certificatesAction.service.js +3 -3
- package/lib/src/services/certificatesAction.service.js.map +1 -1
- package/lib/src/services/conf.service.d.ts +12 -2
- package/lib/src/services/conf.service.d.ts.map +1 -1
- package/lib/src/services/conf.service.js +60 -3
- package/lib/src/services/conf.service.js.map +1 -1
- package/lib/src/services/domains.service.d.ts +26 -3
- package/lib/src/services/domains.service.d.ts.map +1 -1
- package/lib/src/services/domains.service.js +114 -12
- package/lib/src/services/domains.service.js.map +1 -1
- package/lib/src/services/editorBase.service.js +1 -1
- package/lib/src/services/editorBase.service.js.map +1 -1
- package/lib/src/services/handleFile.service.js +1 -1
- package/lib/src/services/handleFile.service.js.map +1 -1
- package/lib/src/services/history.service.d.ts.map +1 -1
- package/lib/src/services/history.service.js +3 -1
- package/lib/src/services/history.service.js.map +1 -1
- package/lib/src/services/hosting.service.d.ts +23 -0
- package/lib/src/services/hosting.service.d.ts.map +1 -0
- package/lib/src/services/hosting.service.js +233 -0
- package/lib/src/services/hosting.service.js.map +1 -0
- package/lib/src/services/hostingCommands.service.d.ts +9 -0
- package/lib/src/services/hostingCommands.service.d.ts.map +1 -0
- package/lib/src/services/hostingCommands.service.js +38 -0
- package/lib/src/services/hostingCommands.service.js.map +1 -0
- package/lib/src/services/publish.service.js +3 -3
- package/lib/src/services/publish.service.js.map +1 -1
- package/lib/src/services/publishMethod.service.js +1 -1
- package/lib/src/services/publishMethod.service.js.map +1 -1
- package/lib/src/services/secret.service.js +2 -2
- package/lib/src/services/secret.service.js.map +1 -1
- package/lib/tests/editorService.spec.js +1 -1
- package/lib/tests/editorService.spec.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostingCommand.model.d.ts","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAEnE,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;QAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC5C,CAAC;CACH;AAED,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GACtC,SAAS,GAAG,OAAO,GAAG,MAAM,GAC5B,CAAC,SAAS,QAAQ,GAChB,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAC5E,KAAK,CAAC;AAEZ,QAAA,MAAM,KAAK,yBAAmE,CAAC;AAiB/E,eAAe,KAAK,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const modelv2_class_1 = __importDefault(require("../classes/modelv2.class"));
|
|
7
|
+
const model = new modelv2_class_1.default('HostingCommand', 'hostingCommands');
|
|
8
|
+
model.setSchema({
|
|
9
|
+
type: 'object',
|
|
10
|
+
properties: {
|
|
11
|
+
target: { type: 'string' },
|
|
12
|
+
command: { type: 'string' },
|
|
13
|
+
date: { type: 'object' },
|
|
14
|
+
company: { type: 'string' },
|
|
15
|
+
project: { type: 'string' },
|
|
16
|
+
state: { type: 'string' },
|
|
17
|
+
data: { type: 'object' },
|
|
18
|
+
},
|
|
19
|
+
additionalProperties: false,
|
|
20
|
+
}, 'create');
|
|
21
|
+
exports.default = model;
|
|
22
|
+
//# sourceMappingURL=hostingCommand.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hostingCommand.model.js","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":";;;;;AAAA,6EAA+C;AAwB/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAiB,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;AAE/E,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,kBAAe,KAAK,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.model.d.ts","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAC/C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAE/C,MAAM,WAAW,WAAY,SAAQ,kBAAkB;IAErD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;CAEd;AAED,QAAA,MAAM,KAAK,sBAAyD,CAAC;AA8DrE,QAAA,MAAM,YAAY,EAAE,WA2CnB,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"permissions.model.d.ts","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAC/C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAE/C,MAAM,WAAW,WAAY,SAAQ,kBAAkB;IAErD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,KAAK,CAAA;CAEd;AAED,QAAA,MAAM,KAAK,sBAAyD,CAAC;AA8DrE,QAAA,MAAM,YAAY,EAAE,WA2CnB,CAAC;AAEF,QAAA,MAAM,YAAY,EAAE,WA0DnB,CAAC;AAEF,QAAA,MAAM,cAAc,EAAE,MAAM,EAQ3B,CAAC;AAEF,eAAe,KAAK,CAAC;AACrB,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,cAAc,GACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.model.js","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":";;;;;;AAGA,6EAA+C;AAY/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAc,aAAa,EAAE,aAAa,CAAC,CAAC;AAErE,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;KACpD;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;IAC9B,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;KACpD;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;IAC9B,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;KACX;IACD,gBAAgB;IAChB,gBAAgB;IAChB,IAAI,EAAE,aAAa;CACpB,EACD,CAAC,CACF,CAAC;AAEF,kBAAkB;AAClB,MAAM;AACN,aAAa;AACb,gBAAgB;AAChB,oBAAoB;AACpB,oBAAoB;AACpB,SAAS;AACT,oBAAoB;AACpB,oBAAoB;AACpB,0BAA0B;AAC1B,OAAO;AACP,OAAO;AACP,KAAK;AAEL,MAAM,YAAY,GAAgB;IAChC,OAAO,EAAE;QACP,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,MAAM;QACN,SAAS;KACV;IACD,GAAG,EAAE;QACH,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,SAAS;KACV;IACD,QAAQ,EAAE;QACR,MAAM;QACN,MAAM;QACN,SAAS;KACV;IACD,WAAW,EAAE;QACX,MAAM;QACN,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,SAAS;KACV;IACD,OAAO,EAAE;QACP,MAAM;QACN,QAAQ;QACR,SAAS;KACV;IACD,OAAO,EAAE;QACP,MAAM;QACN,QAAQ;QACR,MAAM;QACN,OAAO;KACR;IACD,OAAO,EAAE;QACP,MAAM;KACP;CACF,CAAC;
|
|
1
|
+
{"version":3,"file":"permissions.model.js","sourceRoot":"","sources":["../../../src/models/permissions.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import Modelv2 from '../classes/modelv2.class';
|
|
|
2
2
|
import { BasicDataInterface } from '../../interfaces';
|
|
3
3
|
import { Editor } from './editor.model';
|
|
4
4
|
export interface PublishMethod extends BasicDataInterface {
|
|
5
|
-
type: 'ftp' | 'webhook';
|
|
5
|
+
type: 'ftp' | 'webhook' | 'internal';
|
|
6
6
|
active: boolean;
|
|
7
7
|
label: string;
|
|
8
8
|
availableForApps: string[];
|
|
@@ -23,5 +23,9 @@ export interface PublishMethodWebhook extends PublishMethod {
|
|
|
23
23
|
label: string;
|
|
24
24
|
availableForApps: string[];
|
|
25
25
|
}
|
|
26
|
+
export interface PublishMethodInternal extends PublishMethod {
|
|
27
|
+
type: 'internal';
|
|
28
|
+
label: string;
|
|
29
|
+
}
|
|
26
30
|
declare const model: Modelv2<PublishMethod>;
|
|
27
31
|
export default model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-method.model.d.ts","sourceRoot":"","sources":["../../../src/models/publish-method.model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IAEvD,IAAI,EAAE,KAAK,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"publish-method.model.d.ts","sourceRoot":"","sources":["../../../src/models/publish-method.model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IAEvD,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,CAAA;IAEpC,MAAM,EAAE,OAAO,CAAA;IAEf,KAAK,EAAE,MAAM,CAAA;IAEb,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAE1B,cAAc,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;IAElC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAEnB;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IAErD,IAAI,EAAE,KAAK,CAAA;IAEX,QAAQ,EAAE,MAAM,CAAA;IAEhB,QAAQ,EAAE,MAAM,CAAA;IAEhB,IAAI,EAAE,MAAM,CAAA;IAEZ,IAAI,EAAE,MAAM,CAAA;IAEZ,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAA;CAE3B;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IAEzD,IAAI,EAAE,SAAS,CAAA;IAEf,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAA;IAEb,gBAAgB,EAAE,MAAM,EAAE,CAAA;CAE3B;AACD,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAE1D,IAAI,EAAE,UAAU,CAAA;IAEhB,KAAK,EAAE,MAAM,CAAA;CAEd;AAED,QAAA,MAAM,KAAK,wBAAgE,CAAC;AAoN5E,eAAe,KAAK,CAAC"}
|
|
@@ -133,5 +133,59 @@ model.setSchema({
|
|
|
133
133
|
required: ['type', 'active', 'url'],
|
|
134
134
|
additionalProperties: false,
|
|
135
135
|
}, 'changeWebhook');
|
|
136
|
+
model.setSchema({
|
|
137
|
+
type: 'object',
|
|
138
|
+
properties: {
|
|
139
|
+
company: { type: 'string' },
|
|
140
|
+
project: { type: 'string' },
|
|
141
|
+
label: { type: 'string', maxLength: 50 },
|
|
142
|
+
active: { type: 'boolean' },
|
|
143
|
+
type: { enum: ['internal'] },
|
|
144
|
+
affectedStates: {
|
|
145
|
+
type: 'array',
|
|
146
|
+
items: {
|
|
147
|
+
enum: ['draft', 'publish'],
|
|
148
|
+
},
|
|
149
|
+
maxItems: 2,
|
|
150
|
+
},
|
|
151
|
+
availableForApps: {
|
|
152
|
+
type: 'array',
|
|
153
|
+
contains: {
|
|
154
|
+
type: 'string',
|
|
155
|
+
maxLength: 20,
|
|
156
|
+
},
|
|
157
|
+
maxItems: 10,
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
required: ['type', 'active'],
|
|
161
|
+
additionalProperties: false,
|
|
162
|
+
}, 'createInternal');
|
|
163
|
+
model.setSchema({
|
|
164
|
+
type: 'object',
|
|
165
|
+
properties: {
|
|
166
|
+
company: { type: 'string' },
|
|
167
|
+
project: { type: 'string' },
|
|
168
|
+
label: { type: 'string', maxLength: 50 },
|
|
169
|
+
active: { type: 'boolean' },
|
|
170
|
+
type: { enum: ['webhook'] },
|
|
171
|
+
affectedStates: {
|
|
172
|
+
type: 'array',
|
|
173
|
+
items: {
|
|
174
|
+
enum: ['draft', 'publish'],
|
|
175
|
+
},
|
|
176
|
+
maxItems: 2,
|
|
177
|
+
},
|
|
178
|
+
availableForApps: {
|
|
179
|
+
type: 'array',
|
|
180
|
+
contains: {
|
|
181
|
+
type: 'string',
|
|
182
|
+
maxLength: 20,
|
|
183
|
+
},
|
|
184
|
+
maxItems: 10,
|
|
185
|
+
},
|
|
186
|
+
},
|
|
187
|
+
required: ['type', 'active'],
|
|
188
|
+
additionalProperties: false,
|
|
189
|
+
}, 'changeInternal');
|
|
136
190
|
exports.default = model;
|
|
137
191
|
//# sourceMappingURL=publish-method.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-method.model.js","sourceRoot":"","sources":["../../../src/models/publish-method.model.ts"],"names":[],"mappings":";;;;;AAAA,6EAA+C;
|
|
1
|
+
{"version":3,"file":"publish-method.model.js","sourceRoot":"","sources":["../../../src/models/publish-method.model.ts"],"names":[],"mappings":"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"}
|
package/lib/src/nginx.class.js
CHANGED
|
@@ -30,7 +30,7 @@ class Nginx {
|
|
|
30
30
|
}
|
|
31
31
|
command(command) {
|
|
32
32
|
return new Promise((resolve, reject) => {
|
|
33
|
-
child_process_1.exec(command, (e, stdout, stderr) => {
|
|
33
|
+
(0, child_process_1.exec)(command, (e, stdout, stderr) => {
|
|
34
34
|
if (this.debug) {
|
|
35
35
|
if (stdout)
|
|
36
36
|
logger_1.default.debug('stdout ', stdout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nginx.class.js","sourceRoot":"","sources":["../../src/nginx.class.ts"],"names":[],"mappings":";;;;;AAAA,iDAAqC;AACrC,sDAA8B;AAE9B,MAAqB,KAAK;IAIxB,YAAY,QAAiB,KAAK;QAFlC,UAAK,GAAY,KAAK,CAAC;QAIrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAErB,CAAC;IAED,IAAI;QAEF,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,CAAC;IAED,KAAK;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE/C,CAAC;IAED,OAAO;QAEL,OAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEjD,CAAC;IAED,MAAM;QAEJ,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAEhD,CAAC;IAED,MAAM;QAEJ,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEnD,CAAC;IAED,KAAK;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC,CAAC;IAED,OAAO,CAAC,OAAe;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAErC,oBAAI,
|
|
1
|
+
{"version":3,"file":"nginx.class.js","sourceRoot":"","sources":["../../src/nginx.class.ts"],"names":[],"mappings":";;;;;AAAA,iDAAqC;AACrC,sDAA8B;AAE9B,MAAqB,KAAK;IAIxB,YAAY,QAAiB,KAAK;QAFlC,UAAK,GAAY,KAAK,CAAC;QAIrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAErB,CAAC;IAED,IAAI;QAEF,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,CAAC;IAED,KAAK;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAE/C,CAAC;IAED,OAAO;QAEL,OAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEjD,CAAC;IAED,MAAM;QAEJ,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAEhD,CAAC;IAED,MAAM;QAEJ,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEnD,CAAC;IAED,KAAK;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAElC,CAAC;IAED,OAAO,CAAC,OAAe;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAErC,IAAA,oBAAI,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAElC,IAAI,IAAI,CAAC,KAAK,EAAE;oBAEd,IAAI,MAAM;wBAAE,gBAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;oBAC5C,IAAI,MAAM;wBAAE,gBAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;iBAE7C;gBAED,IAAI,CAAC,YAAY,KAAK,EAAE;oBAEtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;iBAElB;gBAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;YAEzB,CAAC,CAAC,CAAC;QAEL,CAAC,CAAC,CAAC;IAEL,CAAC;CAEF;AAzED,wBAyEC"}
|
|
@@ -39,18 +39,18 @@ const createIndex = (modules) => {
|
|
|
39
39
|
return index;
|
|
40
40
|
};
|
|
41
41
|
exports.default = (content, layout, namespace = 'lila') => {
|
|
42
|
-
const namespacedContent = hardCopy_1.default(content);
|
|
42
|
+
const namespacedContent = (0, hardCopy_1.default)(content);
|
|
43
43
|
if (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules)
|
|
44
44
|
addNamespace(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, namespace);
|
|
45
|
-
if (namespacedContent.modules && content.childData) {
|
|
45
|
+
if ((namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) && content.childData) {
|
|
46
46
|
distributeChildData(namespacedContent.modules, content.childData);
|
|
47
47
|
}
|
|
48
48
|
const combinedContent = {
|
|
49
|
-
id: content.id,
|
|
49
|
+
id: content === null || content === void 0 ? void 0 : content.id,
|
|
50
50
|
settings: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.settings) || {},
|
|
51
|
-
top: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? filterMergeModules_1.default(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'top', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
52
|
-
content: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? filterMergeModules_1.default(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'content', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
53
|
-
bottom: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? filterMergeModules_1.default(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'bottom', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
51
|
+
top: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? (0, filterMergeModules_1.default)(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'top', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
52
|
+
content: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? (0, filterMergeModules_1.default)(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'content', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
53
|
+
bottom: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? (0, filterMergeModules_1.default)(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules, 'bottom', layout === null || layout === void 0 ? void 0 : layout.modules) : [],
|
|
54
54
|
additional: {
|
|
55
55
|
index: (namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) ? createIndex(namespacedContent === null || namespacedContent === void 0 ? void 0 : namespacedContent.modules) : [],
|
|
56
56
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareContent.js","sourceRoot":"","sources":["../../src/prepareContent.ts"],"names":[],"mappings":";;;;;AAAA,8EAAsD;AACtD,kEAA0C;AAM1C,MAAM,YAAY,GAAG,CAAC,OAA2B,EAAE,YAAoB,MAAM,EAAE,EAAE;IAE/E,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAE1B,qCAAqC;QACrC,IAAI,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,SAAS,GAAG,CAAC,CAAC;YAAE,OAAO;QAC5D,MAAM,CAAC,IAAI,GAAG,GAAG,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAE5C,8CAA8C;QAC9C,IAAI,MAAM,CAAC,OAAO;YAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE9D,CAAC,CAAC,CAAC;AAEL,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAA2B,EAAE,SAAoB,EAAE,EAAE;IAEhF,OAAO,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;;QAE/B,IAAI,CAAC,CAAA,MAAA,YAAY,CAAC,SAAS,0CAAE,KAAK,CAAA;YAAE,OAAO;QAE3C,MAAM,OAAO,GAA4B,EAAE,CAAC;QAE5C,MAAA,YAAY,CAAC,SAAS,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAE/C,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5C,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,IAAI,GAAG,OAAO,CAAC;IAExC,CAAC,CAAC,CAAC;AAEL,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,OAA2B,EAAE,EAAE;IAElD,MAAM,KAAK,GAAyB,EAAE,CAAC;IAEvC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAEzB,IAAI,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,KAAK,MAAI,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,CAAA;YAAE,KAAK,CAAC,IAAI,iCAAM,MAAM,CAAC,KAAK,KAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAG,CAAC;IAEzH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AAEf,CAAC,CAAC;AAEF,kBAAe,CAAC,OAAyB,EAAE,MAAgB,EAAE,YAAoB,MAAM,EAAE,EAAE;IAEzF,MAAM,iBAAiB,GAAqB,kBAAQ,
|
|
1
|
+
{"version":3,"file":"prepareContent.js","sourceRoot":"","sources":["../../src/prepareContent.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,7 @@ class CertificatesService extends Immutable_class_1.default {
|
|
|
88
88
|
convertToPfx(certificate, privateKey, tempName) {
|
|
89
89
|
return new Promise((resolve, reject) => {
|
|
90
90
|
// eslint-disable-next-line max-len
|
|
91
|
-
child_process_1.exec(`openssl pkcs12 -export -passout pass: -inkey <(echo "${privateKey}") -in <(echo "${certificate}") -out ${tempName}.pfx`, { timeout: 5000 }, (e, stdout, stderr) => {
|
|
91
|
+
(0, child_process_1.exec)(`openssl pkcs12 -export -passout pass: -inkey <(echo "${privateKey}") -in <(echo "${certificate}") -out ${tempName}.pfx`, { timeout: 5000 }, (e, stdout, stderr) => {
|
|
92
92
|
// if (this.debug) {
|
|
93
93
|
logger_1.default.debug('stdout ', stdout);
|
|
94
94
|
logger_1.default.debug('stderr ', stderr);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"certificates.service.js","sourceRoot":"","sources":["../../../src/services/certificates.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"certificates.service.js","sourceRoot":"","sources":["../../../src/services/certificates.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,14 +33,14 @@ class CertificatesActionsService extends Immutable_class_1.default {
|
|
|
33
33
|
return newAction;
|
|
34
34
|
}
|
|
35
35
|
planRenew(certificate, validPercent, user, app) {
|
|
36
|
-
const validDays = dayjs_1.default(certificate.valid.to).diff(certificate.valid.from, 'days');
|
|
36
|
+
const validDays = (0, dayjs_1.default)(certificate.valid.to).diff(certificate.valid.from, 'days');
|
|
37
37
|
const renewInDays = Math.floor((validDays * (validPercent / 100)));
|
|
38
38
|
if (renewInDays < 1) {
|
|
39
39
|
logger_1.default.info('cant plan renew of certificate, renew in days is smaller than 1');
|
|
40
40
|
return new Promise((resolve) => resolve());
|
|
41
41
|
}
|
|
42
42
|
const renewObject = {
|
|
43
|
-
planned: dayjs_1.default(certificate.valid.from).add(renewInDays, 'days').toDate(),
|
|
43
|
+
planned: (0, dayjs_1.default)(certificate.valid.from).add(renewInDays, 'days').toDate(),
|
|
44
44
|
type: certificate.type,
|
|
45
45
|
contentType: certificate.contentType,
|
|
46
46
|
domains: certificate.domains,
|
|
@@ -50,7 +50,7 @@ class CertificatesActionsService extends Immutable_class_1.default {
|
|
|
50
50
|
return this.create(renewObject, user, app);
|
|
51
51
|
}
|
|
52
52
|
async planRetry(certificateAction, user, app) {
|
|
53
|
-
const renewObject = Object.assign(Object.assign({}, hardCopy_1.default(certificateAction)), { state: 'new', renew: true });
|
|
53
|
+
const renewObject = Object.assign(Object.assign({}, (0, hardCopy_1.default)(certificateAction)), { state: 'new', renew: true });
|
|
54
54
|
delete renewObject._id;
|
|
55
55
|
delete renewObject.history;
|
|
56
56
|
delete renewObject.result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"certificatesAction.service.js","sourceRoot":"","sources":["../../../src/services/certificatesAction.service.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAuE;AAEvE,kDAA0B;AAC1B,uDAA+B;AAE/B,yEAA2C;AAC3C,kGAA+F;AAE/F,mEAA2C;AAE3C,MAAa,0BAA2B,SAAQ,yBAA4B;IAQ1E,YAAY,gBAAwB;QAElC,KAAK,EAAE,CAAC;QARV,UAAK,GAAG,kCAAsB,CAAC;QAU7B,IAAI,gBAAgB,EAAE;YAEpB,IAAI,CAAC,OAAO,GAAG,kCAAkB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;YAEzE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SAEpD;IAEH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,OAAqC,EACrC,IAA+B,EAC/B,WAA6C,EAC7C,KAAc,EACd,OAAe,EACf,OAAe,EACf,IAAY,EACZ,GAAW;QAGX,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAClC,OAAO;YACP,IAAI;YACJ,WAAW;YACX,KAAK;YACL,KAAK,EAAE,KAAK;YACZ,OAAO;YACP,OAAO;SACR,EACD,IAAI,EACJ,GAAG,CAAC,CAAC;QAEL,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,SAAS,CAAC;IAEnB,CAAC;IAED,SAAS,CAAC,WAAwB,EAAE,YAAoB,EAAE,IAAY,EAAE,GAAW;QAEjF,MAAM,SAAS,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"certificatesAction.service.js","sourceRoot":"","sources":["../../../src/services/certificatesAction.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import DomainConf from '../interfaces/DomainConf.interface';
|
|
3
3
|
import ShareClientInterface from '../interfaces/ShareClient.interface';
|
|
4
|
-
export
|
|
4
|
+
export declare class ConfService {
|
|
5
5
|
shareClient: ShareClientInterface;
|
|
6
6
|
/**
|
|
7
7
|
*
|
|
8
8
|
* load the base nginx conf file for further rendering
|
|
9
9
|
*/
|
|
10
10
|
getBase(folder: string, name: string): Promise<Buffer>;
|
|
11
|
-
constructor(
|
|
11
|
+
constructor();
|
|
12
12
|
/**
|
|
13
13
|
* generates nginx config
|
|
14
14
|
*
|
|
@@ -24,4 +24,14 @@ export default class ConfService {
|
|
|
24
24
|
* validate domains and remove double entries
|
|
25
25
|
*/
|
|
26
26
|
validateStreamDomains(domains: DomainConf[]): DomainConf[];
|
|
27
|
+
/**
|
|
28
|
+
* docker: docker, stream: nginx main stream conf, proxy: nginx main proxy config, project: project nginx
|
|
29
|
+
*/
|
|
30
|
+
refresh(type: 'project', company: string, project: string): Promise<boolean>;
|
|
31
|
+
refresh(type: 'docker' | 'stream' | 'proxy'): Promise<boolean>;
|
|
32
|
+
refreshDockerCompose(base?: string): Promise<boolean>;
|
|
33
|
+
refreshNginx(type: 'stream' | 'proxy' | 'project', company: string | undefined, project: string | undefined): Promise<boolean>;
|
|
34
|
+
createFolderRecursive(base: string, path: string): Promise<boolean>;
|
|
27
35
|
}
|
|
36
|
+
declare const _default: ConfService;
|
|
37
|
+
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conf.service.d.ts","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"conf.service.d.ts","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":";AAEA,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAC5D,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AAIvE,qBAAa,WAAW;IAEtB,WAAW,EAAE,oBAAoB,CAAC;IAElC;;;OAGG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;IAkBpC;;;SAGK;IACL,MAAM,CACJ,IAAI,EAAE,UAAU,GAAG,SAAS,EAC5B,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,EAC/B,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,MAAM;IAYT,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAYnE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB;;;IAiC1F,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAMvC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE;IAcjC;;OAEG;IACH,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE;IAsC3C;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAC5E,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD,oBAAoB,CAAC,IAAI,SAAoB;IAa7C,YAAY,CAChB,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,SAAS;IA+D7B,qBAAqB,CAAC,IAAI,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM;CAMhD;;AACD,wBAAiC"}
|
|
@@ -3,10 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ConfService = void 0;
|
|
6
7
|
const handlebars_1 = __importDefault(require("handlebars"));
|
|
8
|
+
const ShareClientFactory_class_1 = __importDefault(require("../ShareClientFactory.class"));
|
|
9
|
+
const domains_service_1 = __importDefault(require("./domains.service"));
|
|
10
|
+
const hosting_service_1 = __importDefault(require("./hosting.service"));
|
|
7
11
|
class ConfService {
|
|
8
|
-
constructor(
|
|
9
|
-
this.shareClient =
|
|
12
|
+
constructor() {
|
|
13
|
+
this.shareClient = (0, ShareClientFactory_class_1.default)(process.env.HOSTING_STORAGE_TYPE, {
|
|
14
|
+
connectionString: process.env.HOSTING_STORAGE_CONNECTION,
|
|
15
|
+
shareName: 'customer-apps',
|
|
16
|
+
});
|
|
10
17
|
}
|
|
11
18
|
/**
|
|
12
19
|
*
|
|
@@ -111,6 +118,56 @@ class ConfService {
|
|
|
111
118
|
});
|
|
112
119
|
return filteredDomains;
|
|
113
120
|
}
|
|
121
|
+
refresh(type, company, project) {
|
|
122
|
+
if (type === 'docker') {
|
|
123
|
+
return this.refreshDockerCompose();
|
|
124
|
+
}
|
|
125
|
+
if (['stream', 'proxy', 'project'].includes(type)) {
|
|
126
|
+
return this.refreshNginx(type, company, project);
|
|
127
|
+
}
|
|
128
|
+
return null;
|
|
129
|
+
}
|
|
130
|
+
async refreshDockerCompose(base = '/base/data/user') {
|
|
131
|
+
const domains = await hosting_service_1.default.getActive();
|
|
132
|
+
const mappedDomains = domains_service_1.default.mapPortToRealPorts(domains, { http: 8000, https: 9000 });
|
|
133
|
+
return this.shareClient.create('', 'docker-compose.json', JSON.stringify(this.getComposeObject(mappedDomains, base)));
|
|
134
|
+
}
|
|
135
|
+
async refreshNginx(type, company, project) {
|
|
136
|
+
let template = '';
|
|
137
|
+
let targetFile = '';
|
|
138
|
+
let targetFolder = '';
|
|
139
|
+
let renderedConf = '';
|
|
140
|
+
if (type === 'stream') {
|
|
141
|
+
template = 'stream.conf';
|
|
142
|
+
targetFile = 'stream.conf';
|
|
143
|
+
targetFolder = 'conf';
|
|
144
|
+
}
|
|
145
|
+
if (type === 'proxy') {
|
|
146
|
+
template = 'proxy_http.conf';
|
|
147
|
+
targetFile = 'proxy_http.conf';
|
|
148
|
+
targetFolder = 'conf';
|
|
149
|
+
}
|
|
150
|
+
if (type === 'project') {
|
|
151
|
+
template = '.conf';
|
|
152
|
+
targetFile = 'nginx.conf';
|
|
153
|
+
targetFolder = `user/${company}/${project}/conf`;
|
|
154
|
+
}
|
|
155
|
+
const confBase = (await this.getBase('base', template)).toString();
|
|
156
|
+
if (type === 'stream' || type === 'proxy') {
|
|
157
|
+
const domains = await domains_service_1.default.getAllDomainsWithPorts();
|
|
158
|
+
renderedConf = this.renderStreamConf(domains_service_1.default.mapPortToRealPorts(domains, { http: 8000, https: 9000 }), confBase);
|
|
159
|
+
}
|
|
160
|
+
if (type === 'project' && company && project) {
|
|
161
|
+
const domains = await domains_service_1.default.getDomainsWithPorts(company, project);
|
|
162
|
+
const mappedDomains = domains_service_1.default.mapDomainsProject(domains, { http: 8000, https: 9000 });
|
|
163
|
+
renderedConf = this.render(mappedDomains === null || mappedDomains === void 0 ? void 0 : mappedDomains.http, mappedDomains === null || mappedDomains === void 0 ? void 0 : mappedDomains.https, mappedDomains === null || mappedDomains === void 0 ? void 0 : mappedDomains.defaultDomain, company, project, confBase);
|
|
164
|
+
}
|
|
165
|
+
return this.shareClient.create(targetFolder, targetFile, renderedConf);
|
|
166
|
+
}
|
|
167
|
+
createFolderRecursive(base, path) {
|
|
168
|
+
return this.shareClient.createFolder(base, path);
|
|
169
|
+
}
|
|
114
170
|
}
|
|
115
|
-
exports.
|
|
171
|
+
exports.ConfService = ConfService;
|
|
172
|
+
exports.default = new ConfService();
|
|
116
173
|
//# sourceMappingURL=conf.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"conf.service.js","sourceRoot":"","sources":["../../../src/services/conf.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import DomainConf from '../interfaces/DomainConf.interface';
|
|
|
3
3
|
import Immutable from '../Immutable.class';
|
|
4
4
|
import { Domain } from '../models/domain.model';
|
|
5
5
|
import HostingPorts from '../interfaces/HostingPorts.interface';
|
|
6
|
+
import { Hosting } from '../models/hosting.model';
|
|
6
7
|
declare class DomainsService extends Immutable<Domain> {
|
|
7
8
|
model: import("../classes/modelv2.class").default<Domain>;
|
|
8
9
|
single(internalId: ObjectId, company: string, project: string): Promise<import("mongodb").WithId<Domain> | null>;
|
|
@@ -16,13 +17,35 @@ declare class DomainsService extends Immutable<Domain> {
|
|
|
16
17
|
checkDns(domain: string, company: string, project: string): Promise<boolean>;
|
|
17
18
|
getDefaultDomain(company: string, project: string, hostingDomain: string): string;
|
|
18
19
|
getAllDomains(): Promise<import("mongodb").WithId<Domain>[]>;
|
|
19
|
-
|
|
20
|
+
createDefaultDomain(company: string, project: string, user: string, app: string): Promise<import("../interfaces/CreateResult.interface").default<Domain> | (import("mongodb").UpdateResult & {
|
|
21
|
+
_id: ObjectId;
|
|
22
|
+
})>;
|
|
23
|
+
/**
|
|
24
|
+
* get all domains for specific project with ports and certificates
|
|
25
|
+
*/
|
|
26
|
+
getDomainsWithPorts(company: string, project: string): Promise<(Domain & {
|
|
20
27
|
port: number;
|
|
21
28
|
})[]>;
|
|
22
29
|
/**
|
|
23
|
-
|
|
30
|
+
* get all domains from active hosting with ports and certificates
|
|
31
|
+
*/
|
|
32
|
+
getAllDomainsWithPorts(): Promise<(Hosting & {
|
|
33
|
+
port: number;
|
|
34
|
+
domains: Domain[];
|
|
35
|
+
})[]>;
|
|
36
|
+
mapAllDomainWithPorts(domains: Hosting & {
|
|
37
|
+
port: number;
|
|
38
|
+
} & Domain[]): void;
|
|
39
|
+
/**
|
|
40
|
+
* add the ports to the domains
|
|
24
41
|
*/
|
|
25
|
-
|
|
42
|
+
mapPortToRealPorts<T>(domains: (T & {
|
|
43
|
+
ports?: Record<string, number>;
|
|
44
|
+
port?: number;
|
|
45
|
+
})[], port: HostingPorts): (T & {
|
|
46
|
+
ports?: Record<string, number> | undefined;
|
|
47
|
+
port?: number | undefined;
|
|
48
|
+
})[];
|
|
26
49
|
/**
|
|
27
50
|
*
|
|
28
51
|
* map the database format to the working format
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domains.service.d.ts","sourceRoot":"","sources":["../../../src/services/domains.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInC,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAC5D,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAoB,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,YAAY,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"domains.service.d.ts","sourceRoot":"","sources":["../../../src/services/domains.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAInC,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAC5D,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAoB,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAqB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAIhE,cAAM,cAAe,SAAQ,SAAS,CAAC,MAAM,CAAC;IAE5C,KAAK,qDAAe;IAEpB,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAMvD,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAiB3D,eAAe,CAAC,qBAAqB,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM5H,mBAAmB,CAAC,qBAAqB,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAenI;;;OAGG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAsBzD,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IA8CxE,aAAa;IAMb,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;;;IAqB/E;;OAEG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;cAKT,MAAM;;IA+DvD;;OAEG;IACG,sBAAsB;cAEwB,MAAM;iBAAW,MAAM,EAAE;;IAgF7E,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,EAAE;IAYlE;;QAEI;IACJ,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC,EAAG,EAAE,IAAI,EAAE,YAAY;;;;IAe3G;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,EAAE,GAAG,UAAU,EAAE;IA6B9D;;;OAGG;IACH,iBAAiB,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY;cAmD9C,UAAU;eAAS,UAAU,EAAE;;;CAU7D;;AAED,wBAAoC"}
|