Merge lp:~kaaloo/charms/precise/elasticsearch/trunk into lp:~charmers/charms/precise/elasticsearch/trunk

[Luis Arias]

The default elasticsearch version for this charm was really old so I changed it to 0.90.3 which is the currently compatible version with latest logstash 1.2.1. I changed the download url for elasticsearch because they stopped using github for this a long time ago and now have a download area on elasticsearch.org. I updated the default checksum and also the checksum algorithm to sha1 because elasticsearch.org now provides these.

[Marco Ceppi (marcoceppi)]

Thanks for the update! This looks good to me +1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-11-06 04:34:30 +0000
+++ config.yaml	2013-09-29 13:37:56 +0000
@@ -1,7 +1,7 @@
 options:
   version:
     type: string
-    default: "0.19.10"
+    default: "0.90.3"
     description: |
       This sets the elasticsearch version number that will be used.
       If you're  going to plug in logstash,  make sure versions match.
@@ -36,9 +36,9 @@
       This sets the s3 bucket name for the elasticsearch s3 gateway.
   checksum:
     type: string
-    default: "1e32776a453b7947dc525c4b095b30ce"
+    default: "24843192bee3afd19f5a958800e896153dbc3569"
     description: |
-      MD5 checksum of elasticsearch download.
+      SHA1 checksum of elasticsearch download.
   checksumwrapper:
     type: string
     default: "450fcee5225cc4837e8b61eb64bcc2d2"
@@ -46,7 +46,7 @@
       MD5 checksum of elasticsearch service wrapper download.
   downloadurl:
     type: string
-    default: "https://github.com/downloads/elasticsearch/elasticsearch"
+    default: "https://download.elasticsearch.org/elasticsearch/elasticsearch"
     description: |
       URL to download elasticsearch from.
   zenmasters:

=== modified file 'hooks/install'
--- hooks/install	2012-11-11 18:34:00 +0000
+++ hooks/install	2013-09-29 13:37:56 +0000
@@ -22,7 +22,7 @@
     # Download and checksum
     juju-log "elasticsearch wrapper binary not found local ... download"
     wget -q -O /tmp/elasticsearch-$VERSION.tar.gz "${DOWNLOADURL}/elasticsearch-$VERSION.tar.gz"
-    if [[ $(md5sum "/tmp/elasticsearch-$VERSION.tar.gz" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
+    if [[ $(sha1sum "/tmp/elasticsearch-$VERSION.tar.gz" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
       juju-log --log-level CRITICAL "Checksum of elasticsearch-$VERSION.tar.gz failed"
       exit 1
     fi

=== modified file 'revision'
--- revision	2012-06-19 09:49:47 +0000
+++ revision	2013-09-29 13:37:56 +0000
@@ -1,1 +1,1 @@
-26
+28