From 63a6fdceff8342aee43820a659e00d22338b89de Mon Sep 17 00:00:00 2001 From: Matthew J Date: Wed, 4 Aug 2021 09:06:47 +0000 Subject: [PATCH] Document location for cli env file on macOS --- changes/changelog.d/cli-env-file-macos.doc | 1 + docs/users/cli.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/cli-env-file-macos.doc diff --git a/changes/changelog.d/cli-env-file-macos.doc b/changes/changelog.d/cli-env-file-macos.doc new file mode 100644 index 000000000..efa17e2a5 --- /dev/null +++ b/changes/changelog.d/cli-env-file-macos.doc @@ -0,0 +1 @@ +Document location of cli env file on macOS (\!1354) \ No newline at end of file diff --git a/docs/users/cli.rst b/docs/users/cli.rst index f7cf58736..096194e75 100644 --- a/docs/users/cli.rst +++ b/docs/users/cli.rst @@ -87,7 +87,7 @@ To work, the CLI needs to be pointed to a Funkwhale server. This can be done in Env file ^^^^^^^^ -The CLI will try to read configuration options from a ``.env`` file in the current directory, or from ``~/.config/funkwhale/env``. +The CLI will try to read configuration options from a ``.env`` file in the current directory. If this file is not present, it will read the configuration options from ``~/.config/funkwhale/env`` on Linux or ``~/Library/Application Support/funkwhale/env`` on macOS. You can also give it a path to another env file via the ``-e /path/to/.envfile`` flag or the ``ENV_FILE`` environment variable.