Upgrade to 3rdparty version 0.9.4 of elasticsearch/elasticsearch

[dsa-puppet.git] / 3rdparty / modules / elasticsearch / manifests / config.pp

diff --git a/3rdparty/modules/elasticsearch/manifests/config.pp b/3rdparty/modules/elasticsearch/manifests/config.pp
index 3b69e5b05e400bc1c89a9425f5a9af4bb3fd23c5..4a3ba64c95dc4e2b0c596472cc8136143fa8e9f0 100644 (file)
--- a/3rdparty/modules/elasticsearch/manifests/config.pp
+++ b/3rdparty/modules/elasticsearch/manifests/config.pp
@@ -28,7 +28,7 @@ class elasticsearch::config {
 
   File {
     owner => $elasticsearch::elasticsearch_user,
-    group => $elasticsearch::elasticsearch_group
+    group => $elasticsearch::elasticsearch_group,
   }
 
   Exec {
@@ -45,45 +45,45 @@ class elasticsearch::config {
 
     file { $elasticsearch::configdir:
       ensure => directory,
-      mode   => '0644'
+      mode   => '0644',
     }
 
     file { $elasticsearch::params::logdir:
       ensure  => 'directory',
       group   => undef,
       mode    => '0644',
-      recurse => true
+      recurse => true,
     }
 
     file { $elasticsearch::params::homedir:
-      ensure  => 'directory'
+      ensure  => 'directory',
     }
 
     file { "${elasticsearch::params::homedir}/bin":
       ensure  => 'directory',
       recurse => true,
-      mode    => '0755'
+      mode    => '0755',
     }
 
     file { $elasticsearch::plugindir:
       ensure  => 'directory',
-      recurse => true
+      recurse => true,
     }
 
     file { $elasticsearch::datadir:
-      ensure  => 'directory'
+      ensure  => 'directory',
     }
 
     file { "${elasticsearch::homedir}/lib":
       ensure  => 'directory',
-      recurse => true
+      recurse => true,
     }
 
     if $elasticsearch::params::pid_dir {
       file { $elasticsearch::params::pid_dir:
         ensure  => 'directory',
         group   => undef,
-        recurse => true
+        recurse => true,
       }
     }
 
@@ -95,26 +95,31 @@ class elasticsearch::config {
     file { "${elasticsearch::configdir}/templates_import":
       ensure  => 'directory',
       mode    => '0644',
-      require => [ Exec['mkdir_templates_elasticsearch'] ]
+      require => [ Exec['mkdir_templates_elasticsearch'] ],
+    }
+
+    file { "${elasticsearch::configdir}/scripts":
+      ensure => 'directory',
+      mode   => '0644',
     }
 
     # Removal of files that are provided with the package which we don't use
     file { '/etc/init.d/elasticsearch':
-      ensure => 'absent'
+      ensure => 'absent',
     }
     file { '/usr/lib/systemd/system/elasticsearch.service':
-      ensure => 'absent'
+      ensure => 'absent',
     }
 
     file { "${elasticsearch::params::defaults_location}/elasticsearch":
-      ensure => 'absent'
+      ensure => 'absent',
     }
 
     file { '/etc/elasticsearch/elasticsearch.yml':
-      ensure => 'absent'
+      ensure => 'absent',
     }
     file { '/etc/elasticsearch/logging.yml':
-      ensure => 'absent'
+      ensure => 'absent',
     }
 
   } elsif ( $elasticsearch::ensure == 'absent' ) {