From b78a58c0a99a2b537ce2ce5a538075f4de8f12fd Mon Sep 17 00:00:00 2001 From: David Mehren Date: Thu, 26 Nov 2020 21:10:02 +0100 Subject: Update manual install docs for 1.7 Starting with 1.7, releases include the frontend bundle. This commit updates the docs accordingly. Signed-off-by: David Mehren --- docs/setup/manual-setup.md | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'docs') diff --git a/docs/setup/manual-setup.md b/docs/setup/manual-setup.md index 4900093d..41ddc5f7 100644 --- a/docs/setup/manual-setup.md +++ b/docs/setup/manual-setup.md @@ -3,41 +3,31 @@ ## Requirements on your server - Node.js 10.13 or up - -- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL). Must use charset `utf8`: this is typically the - default in PostgreSQL and SQLite, while in MySQL and MariaDB UTF-8 might need to be set with - `alter database character set utf8 collate utf8_bin;` +- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) + The database must use charset `utf8`. This is typically the default in PostgreSQL and SQLite. + In MySQL and MariaDB UTF-8 might need to be set with `alter database character set utf8 collate utf8_bin;` Be aware of older MySQL and MariaDB versions which sometimes use shorter representations of UTF-8 than 4 bytes. This can break if symbols with more bytes are used. You can use `alter database character set utf8mb4 COLLATE utf8mb4_unicode_ci` to be on the safe side. - -- npm (and its dependencies, [node-gyp](https://github.com/nodejs/node-gyp#installation)) - -- yarn - +- NPM (and its dependencies, [node-gyp](https://github.com/nodejs/node-gyp#installation)) +- Yarn - Bash (for the setup script) - -- For **building** HedgeDoc we recommend to use a machine with at least **2GB** RAM +- For **building** the HedgeDoc frontend you need a machine with at least **2 GB** RAM. + - Starting with release 1.7 the release tarball includes the frontend, so building it yourself is not necessary. ## Instructions 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. - +2. Download a [release](https://github.com/hedgedoc/hedgedoc/releases) tarball and extract it. +3. Enter the directory and type `bin/setup`, which will install the dependencies and create configs. 4. Modify the file named `config.json` or configure HedgeDoc through environment variables which will overwrite the configs, see docs [here](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md). - -5. Build front-end bundle by `yarn run build` (use `yarn run dev` if you are in development) - -6. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string. For example: +5. **Skip this step for release 1.7 and newer!** + Build the frontend bundle by `yarn run build` (use `yarn run dev` if you are in development) +6. Modify the file named `.sequelizerc`, change the value of the variable `url` to your db connection string. For example: - `postgres://username:password@localhost:5432/hedgedoc` - `mysql://username:password@localhost:3306/hedgedoc` - `sqlite://:memory:` - 7. It is recommended to start your server manually once: `NODE_ENV=production yarn start`, this way it's easier to see warnings or errors that might occur (leave out `NODE_ENV=production` for development). - 8. Run the server as you like (node, forever, pm2, SystemD, Init-Scripts) ## How to upgrade your installation -- cgit v1.2.3 From 7bcf548cd2483b61175ba92da3e93714f0abc8b4 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 27 Nov 2020 20:57:46 +0100 Subject: Mention that the database connection string needs an absolute path to the SQLite file Signed-off-by: David Mehren --- docs/setup/manual-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/setup/manual-setup.md b/docs/setup/manual-setup.md index 41ddc5f7..859dd83c 100644 --- a/docs/setup/manual-setup.md +++ b/docs/setup/manual-setup.md @@ -26,7 +26,7 @@ 6. Modify the file named `.sequelizerc`, change the value of the variable `url` to your db connection string. For example: - `postgres://username:password@localhost:5432/hedgedoc` - `mysql://username:password@localhost:3306/hedgedoc` - - `sqlite://:memory:` + - `sqlite:///opt/hedgedoc/hedgedoc.sqlite` (note that you need to use an absolute path to the SQLite file) 7. It is recommended to start your server manually once: `NODE_ENV=production yarn start`, this way it's easier to see warnings or errors that might occur (leave out `NODE_ENV=production` for development). 8. Run the server as you like (node, forever, pm2, SystemD, Init-Scripts) -- cgit v1.2.3 From c83c6cb226ada0403dcbee2e07380f7012cf6f1a Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 27 Nov 2020 21:22:32 +0100 Subject: Document that Git can also be used to checkout releases. Signed-off-by: David Mehren --- docs/setup/manual-setup.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/setup/manual-setup.md b/docs/setup/manual-setup.md index 859dd83c..6cb7c75a 100644 --- a/docs/setup/manual-setup.md +++ b/docs/setup/manual-setup.md @@ -19,9 +19,10 @@ 1. Check if you meet the [requirements at the top of this document](#requirements-on-your-server). 2. Download a [release](https://github.com/hedgedoc/hedgedoc/releases) tarball and extract it. + Alternatively, you can use Git to clone the repository and checkout a release, e.g. with `git clone -b 1.7.0 https://github.com/hedgedoc/hedgedoc.git`. 3. Enter the directory and type `bin/setup`, which will install the dependencies and create configs. 4. Modify the file named `config.json` or configure HedgeDoc through environment variables which will overwrite the configs, see docs [here](https://github.com/hedgedoc/hedgedoc/blob/master/docs/configuration.md). -5. **Skip this step for release 1.7 and newer!** +5. **If using the release tarball for 1.7.0 or newer, this step can be skipped.** Build the frontend bundle by `yarn run build` (use `yarn run dev` if you are in development) 6. Modify the file named `.sequelizerc`, change the value of the variable `url` to your db connection string. For example: - `postgres://username:password@localhost:5432/hedgedoc` -- cgit v1.2.3