diff --git a/.sequelizerc b/.sequelizerc index f972b9487a..8c9410fe24 100644 --- a/.sequelizerc +++ b/.sequelizerc @@ -5,7 +5,7 @@ require("@dotenvx/dotenvx").config({ var path = require('path'); module.exports = { - 'config': path.resolve('server/config', 'database.json'), + 'config': path.resolve('server/config', 'database.js'), 'migrations-path': path.resolve('server', 'migrations'), 'models-path': path.resolve('server', 'models'), } diff --git a/server/config/database.js b/server/config/database.js new file mode 100644 index 0000000000..69c2530b5f --- /dev/null +++ b/server/config/database.js @@ -0,0 +1,23 @@ +const shared = { + use_env_variable: process.env.DATABASE_URL ? "DATABASE_URL" : undefined, + dialect: "postgres", + host: process.env.DATABASE_HOST, + port: process.env.DATABASE_PORT || 5432, + username: process.env.DATABASE_USER, + password: process.env.DATABASE_PASSWORD || undefined, + database: process.env.DATABASE_NAME, +}; + +module.exports = { + development: shared, + test: shared, + "production-ssl-disabled": shared, + production: { + ...shared, + dialectOptions: { + ssl: { + rejectUnauthorized: false, + }, + }, + }, +}; diff --git a/server/config/database.json b/server/config/database.json deleted file mode 100644 index fc70a12f64..0000000000 --- a/server/config/database.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "development": { - "use_env_variable": "DATABASE_URL", - "dialect": "postgres" - }, - "test": { - "use_env_variable": "DATABASE_URL", - "dialect": "postgres" - }, - "production": { - "use_env_variable": "DATABASE_URL", - "dialect": "postgres", - "dialectOptions": { - "ssl": { - "rejectUnauthorized": false - } - } - }, - "production-ssl-disabled": { - "use_env_variable": "DATABASE_URL", - "dialect": "postgres" - } -}