From dc1d29aae2e67e5914e13ab4464fc339840adbbd Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Mon, 8 Jun 2020 04:00:37 -0400 Subject: [PATCH] Update configurations.md in both sets of docs (#6563) You can not check that the database is up and running in the bootstrap function, as it is executed after the database connection is initialized Signed-off-by: Adam Gall --- docs/3.0.0-beta.x/concepts/configurations.md | 1 - docs/v3.x/concepts/configurations.md | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/3.0.0-beta.x/concepts/configurations.md b/docs/3.0.0-beta.x/concepts/configurations.md index 9a257ad694..22b098571f 100644 --- a/docs/3.0.0-beta.x/concepts/configurations.md +++ b/docs/3.0.0-beta.x/concepts/configurations.md @@ -67,7 +67,6 @@ Here are some use cases: - Create an admin user if there isn't one. - Fill the database with some necessary data. -- Check that the database is up-and-running. - Load some environment variables. The bootstrap function can be synchronous or asynchronous. diff --git a/docs/v3.x/concepts/configurations.md b/docs/v3.x/concepts/configurations.md index cbca2e8cc1..40c0774c1e 100644 --- a/docs/v3.x/concepts/configurations.md +++ b/docs/v3.x/concepts/configurations.md @@ -172,14 +172,14 @@ module.exports = ({ env }) => ({ | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------- | ----------- | | `host` | Host name | string | `localhost` | | `port` | Port on which the server should be running. | integer | `1337` | -| `emitErrors` | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services. | boolean | `false` | +| `emitErrors` | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services. | boolean | `false` | | `url` | Url of the server. Enable proxy support such as Apache or Nginx, example: `https://mywebsite.com/api`. The url can be relative, if so, it is used with `http://${host}:${port}` as the base url. | string | `''` | | `cron` | Cron configuration (powered by [`node-schedule`](https://github.com/node-schedule/node-schedule)) | Object | | | `cron.enabled` | Enable or disable CRON tasks to schedule jobs at specific dates. | boolean | `false` | | `admin` | Admin panel configuration | Object | | | `admin.url` | Url of your admin panel. Default value: `/admin`. Note: If the url is relative, it will be concatenated with `url`. | string | `/admin` | | `admin.autoOpen` | Enable or disabled administration opening on start. | boolean | `true` | -| `admin.watchIgnoreFiles` | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`). | Array(string) | `[]` | +| `admin.watchIgnoreFiles` | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`). | Array(string) | `[]` | ## Functions @@ -197,7 +197,6 @@ Here are some use cases: - Create an admin user if there isn't one. - Fill the database with some necessary data. -- Check that the database is up-and-running. - Load some environment variables. The bootstrap function can be synchronous or asynchronous.