diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-05-10 17:09:12 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-10 17:09:12 +0200 |
commit | 68629f2773a056b0120b956e0cb425e73fe57cab (patch) | |
tree | 94f79c3baeec31b58d36e37515b753b9d2a02ab6 /.env.production.sample | |
parent | 3191c3b349f67442f3ae42be6e1b141e2392a293 (diff) | |
parent | 780d99c204df824fe959a3db00999f973a29c351 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
Diffstat (limited to '.env.production.sample')
-rw-r--r-- | .env.production.sample | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.env.production.sample b/.env.production.sample index 57779f73c..25ab1b9de 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -10,6 +10,7 @@ DB_NAME=postgres DB_PASS= DB_PORT=5432 # Optional ElasticSearch configuration +# You may also set ES_PREFIX to share the same cluster between multiple Mastodon servers (falls back to REDIS_NAMESPACE if not set) # ES_ENABLED=true # ES_HOST=es # ES_PORT=9200 |