Skip to content

Commit

Permalink
Merge pull request #3545 from rmonnier/default-ecosystem
Browse files Browse the repository at this point in the history
Set ecosystem.config.js as the default ecosystem file
  • Loading branch information
wallet77 authored Mar 19, 2018
2 parents a60580a + d9df60e commit b371865
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ADVANCED_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
- [Without Keymetrics](#without-keymetrics)
- [With Keymetrics](#with-keymetrics)

### Deployment - ecosystem.json
### Deployment - ecosystem.config.js

- [Getting started with deployment](#deployment)
- [Deployment options](#deployment-help)
Expand Down
2 changes: 1 addition & 1 deletion constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var csts = {

TEMPLATE_FOLDER : p.join(__dirname, 'lib/templates'),

APP_CONF_DEFAULT_FILE : 'ecosystem.json',
APP_CONF_DEFAULT_FILE : 'ecosystem.config.js',
APP_CONF_TPL : 'ecosystem.tpl',
APP_CONF_TPL_SIMPLE : 'ecosystem-simple.tpl',
SAMPLE_CONF_FILE : 'sample-conf.js',
Expand Down
2 changes: 1 addition & 1 deletion lib/API/Modules/Modularizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var KNOWN_MODULES = {
* - Generate sample module via pm2 module:generate <module_name>
*/
Modularizer.install = function (CLI, moduleName, opts, cb) {
// if user want to install module from ecosystem.json file
// if user want to install module from ecosystem.config.js file
// it can also be a custom json file's name
if (!moduleName || moduleName.length === 0 || moduleName.indexOf('.json') > 0) {
var file = moduleName || cst.APP_CONF_DEFAULT_FILE;
Expand Down
2 changes: 1 addition & 1 deletion lib/Common.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Common.isConfigFile = function (filename) {
};

/**
* Parses a config file like ecosystem.json. Supported formats: JS, JSON, JSON5, YAML.
* Parses a config file like ecosystem.config.js. Supported formats: JS, JSON, JSON5, YAML.
* @param {string} confString contents of the config file
* @param {string} filename path to the config file
* @return {Object} config object
Expand Down

0 comments on commit b371865

Please sign in to comment.