diff --git a/nuxt.config.js b/nuxt.config.js index 0d92a5e2..1e7a18f6 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,5 +1,4 @@ const config = require('./server/config.js') -config.load() const minifyTheme = require('minify-css-string').default const isDev = (process.env.NODE_ENV !== 'production') diff --git a/server/cli/accounts.js b/server/cli/accounts.js index 72e31abb..a7b93304 100644 --- a/server/cli/accounts.js +++ b/server/cli/accounts.js @@ -1,7 +1,6 @@ let db function _initializeDB () { const config = require('../config') - config.load() config.log_level = 'error' db = require('../api/models/index') return db.initialize() diff --git a/server/config.js b/server/config.js index 8a7b217d..a9f02927 100644 --- a/server/config.js +++ b/server/config.js @@ -37,4 +37,5 @@ let config = { } } +config.load() module.exports = config \ No newline at end of file diff --git a/server/dbconfig.js b/server/dbconfig.js index 6b865c76..77b63199 100644 --- a/server/dbconfig.js +++ b/server/dbconfig.js @@ -1,4 +1,3 @@ // needed by sequelize const config = require('./config') -config.load() module.exports = config.db diff --git a/server/initialize.server.js b/server/initialize.server.js index 4b3158fc..bda4340d 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -1,5 +1,4 @@ const config = require('../server/config') -config.load() const initialize = { // close connections/port/unix socket