Enable dynamic scripting for wiki search servers

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
new file mode 100644 (file)
index 0000000..fa72b69
--- /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 9f5c95bc93fffb1cf4aeec5c9ae44af5ff96959c..984fb1e85ac4d3c7e60cef2d130f4b37c67d28be 100644 (file)
--- 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 b19ebfc3cced265a20a80538997a344681bb8a26..52c38f765ea09cb24324856678bf08b19a93f078 100644 (file)
--- 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 cb533575f21ad92d8b2621f94ef84b0d03d2935c..e6d4564e7a504e3984180d5e930de885b6b2b0ca 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -10,6 +10,9 @@ default_attributes(
   :elasticsearch => {
     :cluster => {
       :name => "wiki"
+    },
+    :script => {
+      :disable_dynamic => false
     }
   },
   :exim => {