yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 13:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2598 from Liroo/master

Browse Source 
[strapi new] cli option inline --dbsrv to enable +srv in mongo connection url
This commit is contained in:
Jim LAURIE 2019-01-27 17:13:59 +01:00 committed by GitHub
commit 012b3c12f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-generate-new/files/config/environments/production/database.json
View File

@ -7,6 +7,7 @@
"client": "mongo", "client": "mongo",
"uri": "${process.env.DATABASE_URI || ''}", "uri": "${process.env.DATABASE_URI || ''}",
"host": "${process.env.DATABASE_HOST || '127.0.0.1'}", "host": "${process.env.DATABASE_HOST || '127.0.0.1'}",
"srv": "${process.env.DATABASE_SRV || false}",
"port": "${process.env.DATABASE_PORT || 27017}", "port": "${process.env.DATABASE_PORT || 27017}",
"database": "${process.env.DATABASE_NAME || 'strapi-production'}", "database": "${process.env.DATABASE_NAME || 'strapi-production'}",
"username": "${process.env.DATABASE_USERNAME || ''}", "username": "${process.env.DATABASE_USERNAME || ''}",

1
packages/strapi-generate-new/files/config/environments/staging/database.json
View File

@ -7,6 +7,7 @@
"client": "mongo", "client": "mongo",
"uri": "${process.env.DATABASE_URI || ''}", "uri": "${process.env.DATABASE_URI || ''}",
"host": "${process.env.DATABASE_HOST || '127.0.0.1'}", "host": "${process.env.DATABASE_HOST || '127.0.0.1'}",
"srv": "${process.env.DATABASE_SRV || false}",
"port": "${process.env.DATABASE_PORT || 27017}", "port": "${process.env.DATABASE_PORT || 27017}",
"database": "${process.env.DATABASE_NAME || 'strapi-staging'}", "database": "${process.env.DATABASE_NAME || 'strapi-staging'}",
"username": "${process.env.DATABASE_USERNAME || ''}", "username": "${process.env.DATABASE_USERNAME || ''}",

1
packages/strapi/bin/strapi-new.js
View File

@ -61,6 +61,7 @@ module.exports = function (name, cliArguments) {
settings: { settings: {
client: cliArguments.dbclient, client: cliArguments.dbclient,
host: cliArguments.dbhost, host: cliArguments.dbhost,
srv: cliArguments.dbsrv,
port: cliArguments.dbport, port: cliArguments.dbport,
database: cliArguments.dbname, database: cliArguments.dbname,
username: cliArguments.dbusername, username: cliArguments.dbusername,

1
packages/strapi/bin/strapi.js
View File

@ -56,6 +56,7 @@ program
.option('--debug', 'Display database connection error') .option('--debug', 'Display database connection error')
.option('--dbclient <dbclient>', 'Database client') .option('--dbclient <dbclient>', 'Database client')
.option('--dbhost <dbhost>', 'Database host') .option('--dbhost <dbhost>', 'Database host')
.option('--dbsrv <dbsrv>', 'Database srv')
.option('--dbport <dbport>', 'Database port') .option('--dbport <dbport>', 'Database port')
.option('--dbname <dbname>', 'Database name') .option('--dbname <dbname>', 'Database name')
.option('--dbusername <dbusername>', 'Database username') .option('--dbusername <dbusername>', 'Database username')