diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 16:34:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 16:34:15 +0200 |
| commit | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (patch) | |
| tree | 6c10523aaf5772dd15f7461d32fd1cc405d18669 /.env.production.sample | |
| parent | 11d4f9eefc7b40df84baceff9b2e0747887b23ec (diff) | |
Fix mastodon:setup to take dotenv/docker-compose differences into account (#16896)
In order to work around https://github.com/mastodon/mastodon/issues/16895, add a warning to .env.production.sample, and change the mastodon:setup rake task to: - output a warning if a variable will be interpreted differently by dotenv and docker-compose - ensure the printed config is compatible with docker-compose
Diffstat (limited to '.env.production.sample')
| -rw-r--r-- | .env.production.sample | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.env.production.sample b/.env.production.sample index 86ae5d111..c24c31c9b 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -4,6 +4,12 @@ # not demonstrate all available configuration options. Please look at # https://docs.joinmastodon.org/admin/config/ for the full documentation. +# Note that this file accepts slightly different syntax depending on whether +# you are using `docker-compose` or not. In particular, if you use +# `docker-compose`, the value of each declared variable will be taken verbatim, +# including surrounding quotes. +# See: https://github.com/mastodon/mastodon/issues/16895 + # Federation # ---------- # This identifies your server and cannot be changed safely later |