diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /.env.nanobox | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to '.env.nanobox')
| -rw-r--r-- | .env.nanobox | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.env.nanobox b/.env.nanobox index 0d14f8a00..8e0af6a8a 100644 --- a/.env.nanobox +++ b/.env.nanobox @@ -14,9 +14,9 @@ DB_PORT=5432 DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano # Optional ElasticSearch configuration -# ES_ENABLED=true -# ES_HOST=localhost -# ES_PORT=9200 +ES_ENABLED=true +ES_HOST=$DATA_ELASTIC_HOST +ES_PORT=9200 # Optimizations LD_PRELOAD=/data/lib/libjemalloc.so |