diff options
author | thursday <xthursdayx@mailbox.org> | 2021-09-18 02:21:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-18 02:21:13 -0400 |
commit | 2b3b2ae202bc24c0db9f135b9d5865abefa16afb (patch) | |
tree | c952dbef8aba5db71a652759a32cbb8a35f4fac9 /config | |
parent | Bump tar from 4.4.15 to 4.4.19 (diff) | |
parent | Fixed NGINX config example indentation. (diff) | |
download | ferdium-server-2b3b2ae202bc24c0db9f135b9d5865abefa16afb.tar.gz ferdium-server-2b3b2ae202bc24c0db9f135b9d5865abefa16afb.tar.zst ferdium-server-2b3b2ae202bc24c0db9f135b9d5865abefa16afb.zip |
Merge pull request #48 from k0staa/master
Moving the server-docker repository to the server repository and enabling image building from the current version of the application code
Diffstat (limited to 'config')
-rw-r--r-- | config/database.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/database.js b/config/database.js index b7f57ad..9372eda 100644 --- a/config/database.js +++ b/config/database.js | |||
@@ -1,3 +1,4 @@ | |||
1 | const path = require("path"); | ||
1 | 2 | ||
2 | /** @type {import('@adonisjs/framework/src/Env')} */ | 3 | /** @type {import('@adonisjs/framework/src/Env')} */ |
3 | const Env = use('Env'); | 4 | const Env = use('Env'); |
@@ -31,7 +32,7 @@ module.exports = { | |||
31 | sqlite: { | 32 | sqlite: { |
32 | client: 'sqlite3', | 33 | client: 'sqlite3', |
33 | connection: { | 34 | connection: { |
34 | filename: Helpers.appRoot(`${Env.get('DATA_DIR', 'database')}/${Env.get('DB_DATABASE', 'development')}.sqlite`), | 35 | filename: path.join(Env.get('DATA_DIR', 'data'), `${Env.get('DB_DATABASE', 'ferdi')}.sqlite`), |
35 | }, | 36 | }, |
36 | useNullAsDefault: true, | 37 | useNullAsDefault: true, |
37 | debug: Env.get('DB_DEBUG', false), | 38 | debug: Env.get('DB_DEBUG', false), |
@@ -54,7 +55,7 @@ module.exports = { | |||
54 | port: Env.get('DB_PORT', ''), | 55 | port: Env.get('DB_PORT', ''), |
55 | user: Env.get('DB_USER', 'root'), | 56 | user: Env.get('DB_USER', 'root'), |
56 | password: Env.get('DB_PASSWORD', ''), | 57 | password: Env.get('DB_PASSWORD', ''), |
57 | database: Env.get('DB_DATABASE', 'adonis'), | 58 | database: Env.get('DB_DATABASE', 'ferdi'), |
58 | }, | 59 | }, |
59 | debug: Env.get('DB_DEBUG', false), | 60 | debug: Env.get('DB_DEBUG', false), |
60 | }, | 61 | }, |
@@ -76,7 +77,7 @@ module.exports = { | |||
76 | port: Env.get('DB_PORT', ''), | 77 | port: Env.get('DB_PORT', ''), |
77 | user: Env.get('DB_USER', 'root'), | 78 | user: Env.get('DB_USER', 'root'), |
78 | password: Env.get('DB_PASSWORD', ''), | 79 | password: Env.get('DB_PASSWORD', ''), |
79 | database: Env.get('DB_DATABASE', 'adonis'), | 80 | database: Env.get('DB_DATABASE', 'ferdi'), |
80 | ssl: JSON.parse(Env.get('DB_SSL', 'true')), | 81 | ssl: JSON.parse(Env.get('DB_SSL', 'true')), |
81 | }, | 82 | }, |
82 | debug: Env.get('DB_DEBUG', false), | 83 | debug: Env.get('DB_DEBUG', false), |