diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /.env.production.sample | |
parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to '.env.production.sample')
-rw-r--r-- | .env.production.sample | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample index 65f3f9d1f..86f770e78 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 @@ -55,7 +61,9 @@ DB_PORT=5432 #ES_ENABLED=true #ES_HOST=localhost #ES_PORT=9200 - +# Authentication for ES (optional) +#ES_USER=elastic +#ES_PASS=password # Secrets # ------- |