From 137a1c06aac28bcc9ea64903bd071e9d378c94bb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 24 Jul 2015 18:45:10 +0100 Subject: [PATCH] Enable dynamic scripting for wiki search servers --- cookbooks/elasticsearch/attributes/default.rb | 1 + .../elasticsearch/templates/default/elasticsearch.yml.erb | 1 + roles/foundation.rb | 3 +++ roles/wiki.rb | 3 +++ 4 files changed, 8 insertions(+) create mode 100644 cookbooks/elasticsearch/attributes/default.rb diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb new file mode 100644 index 000000000..fa72b698d --- /dev/null +++ b/cookbooks/elasticsearch/attributes/default.rb @@ -0,0 +1 @@ +default[:elasticsearch][:script][:disable_dynamic] = true diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb index 9f5c95bc9..984fb1e85 100644 --- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb +++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb @@ -2,3 +2,4 @@ cluster.name: <%= node[:elasticsearch][:cluster][:name] %> network.host: 127.0.0.1 +script.disable_dynamic: <%= node[:elasticsearch][:script][:disable_dynamic] -%> diff --git a/roles/foundation.rb b/roles/foundation.rb index b19ebfc3c..52c38f765 100644 --- a/roles/foundation.rb +++ b/roles/foundation.rb @@ -13,6 +13,9 @@ default_attributes( :elasticsearch => { :cluster => { :name => "foundation" + }, + :script => { + :disable_dynamic => false } }, :memcached => { diff --git a/roles/wiki.rb b/roles/wiki.rb index cb533575f..e6d4564e7 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -10,6 +10,9 @@ default_attributes( :elasticsearch => { :cluster => { :name => "wiki" + }, + :script => { + :disable_dynamic => false } }, :exim => { -- 2.43.2