diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration-config-file.md | 2 | ||||
| -rw-r--r-- | docs/configuration-env-vars.md | 2 | ||||
| -rw-r--r-- | docs/setup/manual-setup.md | 19 |
3 files changed, 14 insertions, 9 deletions
diff --git a/docs/configuration-config-file.md b/docs/configuration-config-file.md index d24abce6..c1114549 100644 --- a/docs/configuration-config-file.md +++ b/docs/configuration-config-file.md @@ -104,7 +104,7 @@ these are rarely used for various reasons. | variables | example values | description | | --------- | ------ | ----------- | | `email` | `true` or `false` | Set to allow email sign-in. The default is `true`. | -| `allowEmailRegister` | `true` or `false` | Set to allow registration of new accounts using an email address. If set to `false`, you can still create accounts using the command line - see `bin/manage_users` for details. This setting has no effect if `email` is `false`. The default for `allowEmailRegister` is `true`. | +| `allowEmailRegister` | `true` or `false` | Set to allow registration of new accounts using an email address. If set to `false`, you can still create accounts using the command line - see `bin/manage_users` for details (In production mode, remember to run it with `NODE_ENV` set as `production` in the enviroment). This setting has no effect if `email` is `false`. The default for `allowEmailRegister` is `true`. | ### Dropbox Login diff --git a/docs/configuration-env-vars.md b/docs/configuration-env-vars.md index 84155847..bffc2731 100644 --- a/docs/configuration-env-vars.md +++ b/docs/configuration-env-vars.md @@ -91,7 +91,7 @@ defaultNotePath can't be set from env-vars | variable | example value | description | | -------- | ------------- | ----------- | | `CMD_EMAIL` | `true` or `false` | Set to allow email sign-in. The default is `true`. | -| `CMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | Set to allow registration of new accounts using an email address. If set to `false`, you can still create accounts using the command line - see `bin/manage_users` for details. This setting has no effect if `CMD_EMAIL` is `false`. The default for `CMD_ALLOW_EMAIL_REGISTER` is `true`. | +| `CMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | Set to allow registration of new accounts using an email address. If set to `false`, you can still create accounts using the command line - see `bin/manage_users` for details (In production mode, remember to run it with `NODE_ENV` set as `production` in the enviroment). This setting has no effect if `CMD_EMAIL` is `false`. The default for `CMD_ALLOW_EMAIL_REGISTER` is `true`. | ### Dropbox Login diff --git a/docs/setup/manual-setup.md b/docs/setup/manual-setup.md index e13a6f12..4aad56a6 100644 --- a/docs/setup/manual-setup.md +++ b/docs/setup/manual-setup.md @@ -4,7 +4,9 @@ Manual Installation ## Requirements on your server - Node.js 8.5 or up -- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8` +- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL). Must use charset `utf8`: this is typically the + default in PostgreSQL and SQLite, while in MySQL and MariaDB utf8 might need to be set with + `alter database <DBNAME> character set utf8 collate utf8_bin;` - npm (and its dependencies, [node-gyp](https://github.com/nodejs/node-gyp#installation)) - yarn - Bash (for the setup script) @@ -16,12 +18,15 @@ Manual Installation 1. Check if you meet the [requirements at the top of this document](#requirements-on-your-server). 2. Clone this repository (preferred) or download a release and unzip it. 3. Enter the directory and type `bin/setup`, which will install npm dependencies and create configs. -4. Setup the configs, see more below -5. Setup environment variables which will overwrite the configs +4. Modify `config.json`, see docs [here](https://github.com/codimd/server/blob/master/docs/configuration-config-file.md). +5. Instead of modifying `config.json`, it's possible to configure CodiMD through environment variables which will + overwrite the configs, see docs [here](https://github.com/codimd/server/blob/master/docs/configuration-env-vars.md). 6. Build front-end bundle by `yarn run build` (use `yarn run dev` if you are in development) -7. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string - For example: `postgres://username:password@localhost:5432/codimd` -8. It is recommended to start your server manually once: `yarn start --production`, this way it's easier to see warnings or errors that might occur (leave out `--production` for development). +7. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string. For example: + - `postgres://username:password@localhost:5432/codimd` + - `mysql://username:password@localhost:3306/codimd` + - `sqlite://:memory:` +8. It is recommended to start your server manually once: `npm start --production`, this way it's easier to see warnings or errors that might occur (leave out `--production` for development). 9. Run the server as you like (node, forever, pm2, SystemD, Init-Scripts) @@ -35,5 +40,5 @@ If you are upgrading CodiMD from an older version, follow these steps: 4. `git pull` or unzip a new release in the directory. 5. Run `bin/setup`. This will take care of installing dependencies. It is safe to run on an existing installation. 6. Build front-end bundle by `yarn run build` (use `yarn run dev` if you are in development). -7. It is recommended to start your server manually once: `yarn start --production`, this way it's easier to see warnings or errors that might occur (leave out `--production` for development). +7. It is recommended to start your server manually once: `npm start --production`, this way it's easier to see warnings or errors that might occur (leave out `--production` for development). 8. You can now restart the CodiMD server! |