Преглед изворни кода

:gear: fixing knex config ssl bug

tags/0.0.3^2
j пре 3 година
родитељ
комит
47306227e8
3 измењених фајлова са 9 додато и 7 уклоњено
  1. 8
    6
      backend/knexfile.js
  2. 1
    0
      backend/server/index.js
  3. 0
    1
      backend/server/manifest.js

+ 8
- 6
backend/knexfile.js Прегледај датотеку

1
 require('dotenv').config()
1
 require('dotenv').config()
2
 const fs = require('fs')
2
 const fs = require('fs')
3
 
3
 
4
+const isLocal = process.env.USE_LOCAL_DB == 'true' ? true : false
5
+
4
 const local = {
6
 const local = {
5
     host: process.env.DB_HOST,
7
     host: process.env.DB_HOST,
6
     user: process.env.DB_USER,
8
     user: process.env.DB_USER,
19
     port: process.env.PSCALE_DB_PORT ? process.env.PSCALE_DB_PORT : 3306,
21
     port: process.env.PSCALE_DB_PORT ? process.env.PSCALE_DB_PORT : 3306,
20
 }
22
 }
21
 
23
 
22
-const connectionSettings = process.env.USE_LOCAL_DB == 'true' ? local : pscale
23
-
24
 module.exports = {
24
 module.exports = {
25
     development: {
25
     development: {
26
         client: process.env.DB_TYPE,
26
         client: process.env.DB_TYPE,
27
-        connection: connectionSettings,
27
+        connection: isLocal ? local : pscale,
28
         pool: {
28
         pool: {
29
             min: 2,
29
             min: 2,
30
             max: 10,
30
             max: 10,
35
         seeds: {
35
         seeds: {
36
             directory: './db/seeds',
36
             directory: './db/seeds',
37
         },
37
         },
38
-        ssl: {
39
-            ca: fs.readFileSync('/etc/ssl/certs/ca-certificates.crt'),
40
-        },
38
+        ssl: isLocal
39
+            ? {}
40
+            : {
41
+                  ca: fs.readFileSync('/etc/ssl/certs/ca-certificates.crt'),
42
+              },
41
     },
43
     },
42
 }
44
 }

+ 1
- 0
backend/server/index.js Прегледај датотеку

1
+require('dotenv').config()
1
 const Glue = require('@hapi/glue')
2
 const Glue = require('@hapi/glue')
2
 const Exiting = require('exiting')
3
 const Exiting = require('exiting')
3
 const Manifest = require('./manifest')
4
 const Manifest = require('./manifest')

+ 0
- 1
backend/server/manifest.js Прегледај датотеку

1
-require('dotenv').config()
2
 const Confidence = require('@hapipal/confidence')
1
 const Confidence = require('@hapipal/confidence')
3
 const Inert = require('@hapi/inert')
2
 const Inert = require('@hapi/inert')
4
 const Vision = require('@hapi/vision')
3
 const Vision = require('@hapi/vision')

Loading…
Откажи
Сачувај