diff options
| author |   Alec Warner <antarus@gentoo.org> | 2018-02-18 15:25:04 -0500 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2018-02-18 15:25:45 -0500 |
| commit | c529287ab75f16d3b7cf2445c0122b87e9b161d1 (patch) | |
| tree | e2bd8af66f7461ebdb3ea20eca84e397bfac015a /config | |
| parent | REDIS_URL should use redis scheme. (diff) | |
| parent | packages_search: raise result limit for USE-flag search (diff) | |
| download | packages-5-c529287ab75f16d3b7cf2445c0122b87e9b161d1.tar.gz packages-5-c529287ab75f16d3b7cf2445c0122b87e9b161d1.tar.bz2 packages-5-c529287ab75f16d3b7cf2445c0122b87e9b161d1.zip | |
Merge branch 'es-6-compat' into master.v6.0.0
Signed-off-by: Robin Johnson <robbat2@gentoo.org>
Collectively this contains a series of commits to move from
Elasticsearch v2.X to Elasticsearch v6.0.1. It also contains a bundler
update for the ruby environment.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/elasticsearch.rb | 9 | ||||
| -rw-r--r-- | config/initializers/kkuleomi_config.rb.dist | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/config/initializers/elasticsearch.rb b/config/initializers/elasticsearch.rb index 9be3660..e873162 100644 --- a/config/initializers/elasticsearch.rb +++ b/config/initializers/elasticsearch.rb @@ -1,10 +1,9 @@ require 'elasticsearch/persistence/model' -Elasticsearch::Persistence.client = Elasticsearch::Client.new host: ENV['ELASTICSEARCH_URL'] || 'localhost:9200' - -if Rails.env.development? +Elasticsearch::Persistence.client = Elasticsearch::Client.new host: ENV['ELASTICSEARCH_URL'] || 'elasticsearch:9300' +if Rails.env.development? or ENV['RAILS_DEBUG'] logger = ActiveSupport::Logger.new(STDERR) - logger.level = Logger::INFO + logger.level = Logger::DEBUG logger.formatter = proc { |s, d, p, m| "\e[2m#{m}\n\e[0m" } Elasticsearch::Persistence.client.transport.logger = logger -end
\ No newline at end of file +end diff --git a/config/initializers/kkuleomi_config.rb.dist b/config/initializers/kkuleomi_config.rb.dist index 0bbf86e..f6d4937 100644 --- a/config/initializers/kkuleomi_config.rb.dist +++ b/config/initializers/kkuleomi_config.rb.dist @@ -11,8 +11,11 @@ KKULEOMI_FIRST_COMMIT='c1de71edb35b118c3244c0d9d1b3f97c93d41969' # Where does git(1) live? KKULEOMI_GIT='git' +# GIT enabled? +KKULEOMI_DISABLE_GIT=false + # Who gets feedback -KKULEOMI_FEEDBACK_RECIPIENT='a3li@gentoo.org' +KKULEOMI_FEEDBACK_RECIPIENT='gpackages@gentoo.org' # Default arches. KKULEOMI_ARCHES=%w(amd64 x86 alpha arm hppa ia64 ppc ppc64 sparc) |