From 5556767ff73befa2ebe800d18099849bc79f3301 Mon Sep 17 00:00:00 2001 From: Daenney Date: Tue, 5 Dec 2023 11:44:10 +0100 Subject: [PATCH] [docs] Change configuration creation instructions (#2408) * [docs] Change configuration creation instructions This changes the wording to push people towards creating their own configuration, without copying the whole example configuration. This makes it much easier to reconcile necessary configruation changes on upgrades. * [docs] Reword container version section This changes the wording in the Version section to make it more clear what the risks of a moving tag are. It pushes people to use an explicit release tag instead. --- docs/configuration/index.md | 4 ++-- docs/getting_started/installation/container.md | 10 +++++----- docs/getting_started/installation/metal.md | 8 ++------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/configuration/index.md b/docs/configuration/index.md index e113e8ecb..401bbf3f5 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -18,9 +18,9 @@ gotosocial --config-path ./config.yaml server start The command expects a file in [YAML](https://en.wikipedia.org/wiki/YAML) or [JSON](https://en.wikipedia.org/wiki/JSON) format. -An example configuration file, with an explanation of each of the config fields, with default and example values, can be found [here](https://github.com/superseriousbusiness/gotosocial/blob/main/example/config.yaml). +An example configuration file, with an explanation of each of the config fields, with default and example values, can be found [here](https://github.com/superseriousbusiness/gotosocial/blob/main/example/config.yaml). This example file is also included in release downloads. -This example file is included with release downloads, so you can just copy it and edit it to your needs without having to worry too much about what the hell YAML or JSON is. +It's recommended to create your own configuration file with only the settings you need to change for your installation. This ensures you don't have to reconcile changes to defaults or adding/updating/removing settings from your configuration file that you haven't changed away from the defaults on every release. ### Environment Variables diff --git a/docs/getting_started/installation/container.md b/docs/getting_started/installation/container.md index c14e0a999..ff98c4105 100644 --- a/docs/getting_started/installation/container.md +++ b/docs/getting_started/installation/container.md @@ -38,14 +38,14 @@ nano docker-compose.yaml ### Version -If desired, update the GoToSocial Docker image tag to the version of GtS you want to use. +If desired, update the GoToSocial Docker image tag to the version of GtS you want to use: -`latest` - the default. This points to the latest stable release of GoToSocial. - -`snapshot` - points to whatever code is currently on the main branch. Not guaranteed to be stable, and may often be broken. Use with caution. +* `latest`: the default. This points to the latest stable release of GoToSocial. +* `snapshot`: points to whatever code is currently on the main branch. Not guaranteed to be stable, and may often be broken. Use with caution. +* `vX.Y.Z`: release tag. This points to a specific, stable, release of GoToSocial. !!! tip - You can also replace `latest` with a specific GoToSocial version number. This is recommended when you want to make sure that you don't update your GoToSocial version by accident, which can cause problems. The list of releases can be found [right here](https://github.com/superseriousbusiness/gotosocial/releases), with the newest release at the top. Replace `latest` in the docker-compose.yaml with the number of the desired release (without the leading `v` or trailing version name). + Both the `latest` and `snapshot` tags are moving tags, whereas the `vX.Y.Z` tags are immutable. The result of pulling a moving tag might change from day to day. `latest` on one system might not be the same `latest` on a different system. It's recommended to use the `vX.Y.Z` tags instead so you always know exactly which version of GoToSocial you're running. The list of releases can be found [right here](https://github.com/superseriousbusiness/gotosocial/releases), with the newest release at the top. ### Host diff --git a/docs/getting_started/installation/metal.md b/docs/getting_started/installation/metal.md index facc13326..6a4e50344 100644 --- a/docs/getting_started/installation/metal.md +++ b/docs/getting_started/installation/metal.md @@ -43,13 +43,9 @@ This will put the `gotosocial` binary in your current directory, in addition to ## Edit Configuration File -Copy the configuration file from the example folder into your current directory: +Create a new configuration file, based on the `config.yaml` from the `example` folder. You can copy the whole file, but make sure you only retain settings you've changed. This makes it easier to review configuration changes on release upgrades. -```bash -cp ./example/config.yaml . -``` - -Now open the file in your text editor of choice so that you can set some important configuration values. Change the following settings: +You'll probably need to change the following settings: - Set `host` to whatever hostname you're going to be running the server on (eg., `example.org`). - Set `port` to `443`.