yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-11 07:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Alexandre Bodin 2019-11-13 15:22:47 +01:00
commit a86b886bd1
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/strapi-generate-new/lib/resources/json/database.json.js
View File

@ -3,24 +3,16 @@
module.exports = ({ connection, env }) => { module.exports = ({ connection, env }) => {
// Production/Staging Template // Production/Staging Template
if (['production', 'staging'].includes(env)) { if (['production', 'staging'].includes(env)) {
// All available settings (bookshelf and mongoose)
const settingsBase = { const settingsBase = {
client: connection.settings.client, client: connection.settings.client,
host: "${process.env.DATABASE_HOST || '127.0.0.1'}", host: "${process.env.DATABASE_HOST || '127.0.0.1'}",
port: '${process.env.DATABASE_PORT || 27017}', port: '${process.env.DATABASE_PORT || 27017}',
srv: '${process.env.DATABASE_SRV || false}',
database: "${process.env.DATABASE_NAME || 'strapi'}", database: "${process.env.DATABASE_NAME || 'strapi'}",
username: "${process.env.DATABASE_USERNAME || ''}", username: "${process.env.DATABASE_USERNAME || ''}",
password: "${process.env.DATABASE_PASSWORD || ''}", password: "${process.env.DATABASE_PASSWORD || ''}",
ssl: '${process.env.DATABASE_SSL || false}',
}; };
// All available options (bookshelf and mongoose) const optionsBase = {};
const optionsBase = {
ssl: '${process.env.DATABASE_SSL || false}',
authenticationDatabase:
"${process.env.DATABASE_AUTHENTICATION_DATABASE || ''}",
};
return { return {
defaultConnection: 'default', defaultConnection: 'default',