From 1d4a546d9008672bf5ecb4a719d710297807d49f Mon Sep 17 00:00:00 2001 From: Damien Alexandre Date: Mon, 8 Sep 2014 12:48:32 +0200 Subject: [PATCH] Provisioning: add ICU plugin and update Elasticsearch version --- .../puphpet/puppet/manifest.pp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp index 8ddc804dd7..167c0d1ee6 100644 --- a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp +++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/manifest.pp @@ -1786,7 +1786,7 @@ if hash_key_equals($rabbitmq_values, 'install', 1) { } } -# Begin elastic search +# Begin Elasticsearch if $elasticsearch_values == undef { $elasticsearch_values = hiera('elastic_search', false) @@ -1794,9 +1794,9 @@ if $elasticsearch_values == undef { if hash_key_equals($elasticsearch_values, 'install', 1) { case $::osfamily { - 'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.2.1.deb' } - 'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.2.1.noarch.rpm' } - default: { fail('Unrecognized operating system for Elastic Search') } + 'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb' } + 'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.noarch.rpm' } + default: { fail('Unrecognized operating system for Elasticsearch') } } $elasticsearch_settings = merge($elasticsearch_values['settings'], { @@ -1805,4 +1805,8 @@ if hash_key_equals($elasticsearch_values, 'install', 1) { }) create_resources('class', { 'elasticsearch' => $elasticsearch_settings }) -} \ No newline at end of file + + # Custom plugins + elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head' } + elasticsearch::plugin{'elasticsearch/elasticsearch-analysis-icu/2.3.0': module_dir => 'analysis-icu' } +}