hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump elasticsearch version to 1.6.0

Browse Source
This commit is contained in:
Benoît Burnichon
2015-07-08 12:07:32 +02:00
parent 647f869b00
commit be320ea7a2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -16,8 +16,8 @@ services:
before_install: before_install:
- composer self-update --no-progress --no-interaction - composer self-update --no-progress --no-interaction
- sudo apt-get purge elasticsearch - sudo apt-get purge elasticsearch
- wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb && sudo dpkg -i --force-confnew elasticsearch-1.3.2.deb - curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb && sudo dpkg -i --force-confnew elasticsearch-1.6.0.deb
- sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0 - sudo /usr/share/elasticsearch/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0
- sudo service elasticsearch start - sudo service elasticsearch start
- echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo 'session.cache_limiter = ""' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini - echo 'extension="redis.so"' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/redis.ini

6
circle.yml
View File

@@ -15,7 +15,7 @@ machine:
dependencies: dependencies:
cache_directories: cache_directories:
- elasticsearch-1.3.2 # relative to the build directory - elasticsearch-1.6.0 # relative to the build directory
- node_modules - node_modules
pre: pre:
- yes '' | pecl install imagick - yes '' | pecl install imagick
@@ -23,8 +23,8 @@ dependencies:
- yes '' | pecl install zmq-beta - yes '' | pecl install zmq-beta
- sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini - sed -i 's/^\(session.cache_limiter = \).*/\1""/' ~/.phpenv/versions/$(phpenv global)/etc/php.ini
post: post:
- if [[ ! -e elasticsearch-1.3.2 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.3.2.tar.gz && tar -xvf elasticsearch-1.3.2.tar.gz && elasticsearch-1.3.2/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.3.0; fi - if [[ ! -e elasticsearch-1.6.0 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.6.0.tar.gz && tar -xvf elasticsearch-1.6.0.tar.gz && elasticsearch-1.6.0/bin/plugin install elasticsearch/elasticsearch-analysis-icu/2.6.0; fi
- elasticsearch-1.3.2/bin/elasticsearch: {background: true} - elasticsearch-1.6.0/bin/elasticsearch: {background: true}
- ./node_modules/.bin/grunt install-assets - ./node_modules/.bin/grunt install-assets
- "./bin/developer assets:compile-less" - "./bin/developer assets:compile-less"

6
resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp vendored
View File

@@ -1794,8 +1794,8 @@ if $elasticsearch_values == undef {
if hash_key_equals($elasticsearch_values, 'install', 1) { if hash_key_equals($elasticsearch_values, 'install', 1) {
case $::osfamily { case $::osfamily {
'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.deb' } 'debian': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb' }
'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.3.2.noarch.rpm' } 'redhat': { $elasticsearch_package_url = 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.noarch.rpm' }
default: { fail('Unrecognized operating system for Elasticsearch') } default: { fail('Unrecognized operating system for Elasticsearch') }
} }
@@ -1809,5 +1809,5 @@ if hash_key_equals($elasticsearch_values, 'install', 1) {
# Custom plugins # Custom plugins
elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head' } elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head' }
elasticsearch::plugin{'elasticsearch/marvel/latest': module_dir => 'marvel' } elasticsearch::plugin{'elasticsearch/marvel/latest': module_dir => 'marvel' }
elasticsearch::plugin{'elasticsearch/elasticsearch-analysis-icu/2.3.0': module_dir => 'analysis-icu' } elasticsearch::plugin{'elasticsearch/elasticsearch-analysis-icu/2.6.0': module_dir => 'analysis-icu' }
} }