diff options
| -rw-r--r-- | .env.nanobox | 2 | ||||
| -rw-r--r-- | .env.production.sample | 2 | ||||
| -rw-r--r-- | config/initializers/chewy.rb | 6 | ||||
| -rw-r--r-- | lib/mastodon/search_cli.rb | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.env.nanobox b/.env.nanobox index d61673836..ad941c947 100644 --- a/.env.nanobox +++ b/.env.nanobox @@ -13,7 +13,7 @@ DB_PORT=5432 # DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano -# Optional ElasticSearch configuration +# Optional Elasticsearch configuration ES_ENABLED=true ES_HOST=$DATA_ELASTIC_HOST ES_PORT=9200 diff --git a/.env.production.sample b/.env.production.sample index c24c31c9b..8eeff3794 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -29,7 +29,7 @@ DB_NAME=mastodon_production DB_PASS= DB_PORT=5432 -# ElasticSearch (optional) +# Elasticsearch (optional) # ------------------------ ES_ENABLED=true ES_HOST=localhost diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb index fbbcbbcde..f303fc54d 100644 --- a/config/initializers/chewy.rb +++ b/config/initializers/chewy.rb @@ -17,7 +17,7 @@ Chewy.settings = { } # We use our own async strategy even outside the request-response -# cycle, which takes care of checking if ElasticSearch is enabled +# cycle, which takes care of checking if Elasticsearch is enabled # or not. However, mind that for the Rails console, the :urgent # strategy is set automatically with no way to override it. Chewy.root_strategy = :custom_sidekiq @@ -32,8 +32,8 @@ module Chewy end end -# ElasticSearch uses Faraday internally. Faraday interprets the +# Elasticsearch uses Faraday internally. Faraday interprets the # http_proxy env variable by default which leads to issues when # Mastodon is run with hidden services enabled, because -# ElasticSearch is *not* supposed to be accessed through a proxy +# Elasticsearch is *not* supposed to be accessed through a proxy Faraday.ignore_env_proxy = true diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb index e36af24f4..6ad9d7b6a 100644 --- a/lib/mastodon/search_cli.rb +++ b/lib/mastodon/search_cli.rb @@ -19,9 +19,9 @@ module Mastodon option :concurrency, type: :numeric, default: 2, aliases: [:c], desc: 'Workload will be split between this number of threads' option :batch_size, type: :numeric, default: 1_000, aliases: [:b], desc: 'Number of records in each batch' option :only, type: :array, enum: %w(accounts tags statuses), desc: 'Only process these indices' - desc 'deploy', 'Create or upgrade ElasticSearch indices and populate them' + desc 'deploy', 'Create or upgrade Elasticsearch indices and populate them' long_desc <<~LONG_DESC - If ElasticSearch is empty, this command will create the necessary indices + If Elasticsearch is empty, this command will create the necessary indices and then import data from the database into those indices. This command will also upgrade indices if the underlying schema has been |