@reldens/cms 0.29.0 → 0.30.0
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/manager.js +9 -1
- package/lib/mysql-installer.js +2 -3
- package/package.json +3 -3
- package/templates/.env.dist +1 -0
package/lib/manager.js
CHANGED
|
@@ -236,7 +236,7 @@ class Manager
|
|
|
236
236
|
}
|
|
237
237
|
let baseConfig = {
|
|
238
238
|
port: this.config.port,
|
|
239
|
-
useHttps: this.
|
|
239
|
+
useHttps: this.determineHttpsUsage(),
|
|
240
240
|
useHelmet,
|
|
241
241
|
domainMapping: this.domainMapping || {},
|
|
242
242
|
defaultDomain: this.defaultDomain,
|
|
@@ -257,6 +257,14 @@ class Manager
|
|
|
257
257
|
return appServerConfig;
|
|
258
258
|
}
|
|
259
259
|
|
|
260
|
+
determineHttpsUsage()
|
|
261
|
+
{
|
|
262
|
+
if(this.config.publicUrl && this.config.publicUrl.startsWith('https://')){
|
|
263
|
+
return true;
|
|
264
|
+
}
|
|
265
|
+
return this.config.host.startsWith('https://');
|
|
266
|
+
}
|
|
267
|
+
|
|
260
268
|
async initializeCmsAfterInstall(props)
|
|
261
269
|
{
|
|
262
270
|
try {
|
package/lib/mysql-installer.js
CHANGED
|
@@ -50,13 +50,12 @@ class MySQLInstaller
|
|
|
50
50
|
FileHandler.createFolder(prismaPath);
|
|
51
51
|
let schemaContent = 'generator client {\n'
|
|
52
52
|
+ ' provider = "prisma-client-js"\n'
|
|
53
|
-
+ ' output
|
|
53
|
+
+ ' output = "./client"\n'
|
|
54
54
|
+ '}\n'
|
|
55
55
|
+ '\n'
|
|
56
56
|
+ 'datasource db {\n'
|
|
57
57
|
+ ' provider = "' + dbConfig.client + '"\n'
|
|
58
|
-
+ ' url
|
|
59
|
-
+ dbConfig.config.host + ':' + dbConfig.config.port + '/' + dbConfig.config.database + '"\n'
|
|
58
|
+
+ ' url = env("RELDENS_DB_URL")\n'
|
|
60
59
|
+ '}';
|
|
61
60
|
FileHandler.writeFile(schemaPath, schemaContent);
|
|
62
61
|
Logger.info('Running prisma generate...');
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reldens/cms",
|
|
3
3
|
"scope": "@reldens",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.30.0",
|
|
5
5
|
"description": "Reldens - CMS",
|
|
6
6
|
"author": "Damian A. Pastorini",
|
|
7
7
|
"license": "MIT",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"url": "https://github.com/damian-pastorini/reldens-cms/issues"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@reldens/server-utils": "^0.
|
|
37
|
-
"@reldens/storage": "^0.
|
|
36
|
+
"@reldens/server-utils": "^0.30.0",
|
|
37
|
+
"@reldens/storage": "^0.72.0",
|
|
38
38
|
"@reldens/utils": "^0.53.0",
|
|
39
39
|
"dotenv": "17.2.2",
|
|
40
40
|
"mustache": "4.2.0"
|
package/templates/.env.dist
CHANGED
|
@@ -6,6 +6,7 @@ RELDENS_DB_NAME={{&dbName}}
|
|
|
6
6
|
RELDENS_DB_USER={{&dbUser}}
|
|
7
7
|
RELDENS_DB_PASSWORD={{&dbPassword}}
|
|
8
8
|
RELDENS_DB_DRIVER={{&dbDriver}}
|
|
9
|
+
RELDENS_DB_URL={{&dbClient}}://{{&dbUser}}:{{&dbPassword}}@{{&dbHost}}:{{&dbPort}}/{{&dbName}}
|
|
9
10
|
|
|
10
11
|
# Admin Panel Configuration
|
|
11
12
|
RELDENS_ADMIN_ROUTE_PATH={{&adminPath}}
|