Add elasticsearch::params::http_cors_enabled

boxen · May 24, 2015 · 8c1a68e · 8c1a68e
1 parent f02fa04
commit 8c1a68e
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 48 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -2,16 +2,17 @@
 #
 
 class elasticsearch::config(
-  $ensure         = $elasticsearch::params::ensure,
-  $cluster        = $elasticsearch::params::cluster,
-  $user           = $elasticsearch::params::user,
-  $configdir      = $elasticsearch::params::configdir,
-  $datadir        = $elasticsearch::params::datadir,
-  $executable     = $elasticsearch::params::executable,
-  $logdir         = $elasticsearch::params::logdir,
-  $host           = $elasticsearch::params::host,
-  $http_port      = $elasticsearch::params::http_port,
-  $transport_port = $elasticsearch::params::transport_port,
+  $ensure            = $elasticsearch::params::ensure,
+  $cluster           = $elasticsearch::params::cluster,
+  $user              = $elasticsearch::params::user,
+  $configdir         = $elasticsearch::params::configdir,
+  $datadir           = $elasticsearch::params::datadir,
+  $executable        = $elasticsearch::params::executable,
+  $logdir            = $elasticsearch::params::logdir,
+  $host              = $elasticsearch::params::host,
+  $http_port         = $elasticsearch::params::http_port,
+  $http_cors_enabled = $elasticsearch::params::http_cors_enabled,
+  $transport_port    = $elasticsearch::params::transport_port,
 ) inherits elasticsearch::params {
 
   $dir_ensure = $ensure ? {

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -4,22 +4,23 @@
 #
 #   include elasticsearch
 class elasticsearch(
-  $ensure         = $elasticsearch::params::ensure,
-
-  $version        = $elasticsearch::params::version,
-  $package        = $elasticsearch::params::package,
-
-  $cluster        = $elasticsearch::params::cluster,
-  $user           = $elasticsearch::params::user,
-  $configdir      = $elasticsearch::params::configdir,
-  $datadir        = $elasticsearch::params::datadir,
-  $executable     = $elasticsearch::params::executable,
-  $logdir         = $elasticsearch::params::logdir,
-  $host           = $elasticsearch::params::host,
-  $http_port      = $elasticsearch::params::http_port,
-  $transport_port = $elasticsearch::params::transport_port,
-
-  $enable         = $elasticsearch::params::enable,
+  $ensure            = $elasticsearch::params::ensure,
+
+  $version           = $elasticsearch::params::version,
+  $package           = $elasticsearch::params::package,
+
+  $cluster           = $elasticsearch::params::cluster,
+  $user              = $elasticsearch::params::user,
+  $configdir         = $elasticsearch::params::configdir,
+  $datadir           = $elasticsearch::params::datadir,
+  $executable        = $elasticsearch::params::executable,
+  $logdir            = $elasticsearch::params::logdir,
+  $host              = $elasticsearch::params::host,
+  $http_port         = $elasticsearch::params::http_port,
+  $transport_port    = $elasticsearch::params::transport_port,
+  $http_cors_enabled = $elasticsearch::params::http_cors_enabled,
+
+  $enable            = $elasticsearch::params::enable,
 ) inherits elasticsearch::params {
 
   include java
@@ -37,15 +38,16 @@
   class { 'elasticsearch::config':
     ensure         => $ensure,
 
-    cluster        => $cluster,
-    user           => $user,
-    configdir      => $configdir,
-    datadir        => $datadir,
-    executable     => $executable,
-    logdir         => $logdir,
-    host           => $host,
-    http_port      => $http_port,
-    transport_port => $transport_port,
+    cluster           => $cluster,
+    user              => $user,
+    configdir         => $configdir,
+    datadir           => $datadir,
+    executable        => $executable,
+    logdir            => $logdir,
+    host              => $host,
+    http_port         => $http_port,
+    transport_port    => $transport_port,
+    http_cors_enabled => $http_cors_enabled,
 
     notify         => Service['elasticsearch'],
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -6,23 +6,25 @@
     Darwin: {
       include boxen::config
 
-      $ensure         = 'present'
+      $ensure            = 'present'
 
-      $version        = '1.5.2-boxen1'
-      $package        = 'boxen/brews/elasticsearch'
+      $version           = '1.5.2-boxen1'
+      $package           = 'boxen/brews/elasticsearch'
 
-      $cluster        = "elasticsearch_boxen_${::boxen_user}"
-      $user           = $::boxen_user
-      $configdir      = "${boxen::config::configdir}/elasticsearch"
-      $datadir        = "${boxen::config::datadir}/elasticsearch"
-      $executable     = "${boxen::config::homebrewdir}/bin/elasticsearch"
-      $logdir         = "${boxen::config::logdir}/elasticsearch"
+      $cluster           = "elasticsearch_boxen_${::boxen_user}"
+      $user              = $::boxen_user
+      $configdir         = "${boxen::config::configdir}/elasticsearch"
+      $datadir           = "${boxen::config::datadir}/elasticsearch"
+      $executable        = "${boxen::config::homebrewdir}/bin/elasticsearch"
+      $logdir            = "${boxen::config::logdir}/elasticsearch"
 
-      $host           = '127.0.0.1'
-      $http_port      = 19200
-      $transport_port = 19300
+      $host              = '127.0.0.1'
+      $http_port         = 19200
+      $transport_port    = 19300
 
-      $enable         = true
+      $http_cors_enabled = false
+
+      $enable            = true
     }
 
     default: {

diff --git a/templates/elasticsearch.yml.erb b/templates/elasticsearch.yml.erb
@@ -27,6 +27,8 @@ transport:
 http:
   port: <%= @http_port %>
   max_content_length: 500mb
+  cors:
+    enabled: <%= @http_cors_enabled %>
 
 gateway:
   type: local