Juju Charms Collection
kibana package

Merge lp:~lazypower/charms/trusty/kibana/311_bump into lp:charms/trusty/kibana

  1. Trusty Tahr (14.04)
  2. 311_bump
  3. Merge into trunk
Proposed by Charles Butler
Status: Merged
Merged at revision: 12
Proposed branch: lp:~lazypower/charms/trusty/kibana/311_bump
Merge into: lp:charms/trusty/kibana
Diff against target: 43 lines (+7/-7)
2 files modified
config.yaml (+4/-4)
hooks/install (+3/-3)
To merge this branch: bzr merge lp:~lazypower/charms/trusty/kibana/311_bump
Reviewer Review Type Date Requested Status
David Britton (community) Approve
charmers Pending
Review via email: mp+240674@code.launchpad.net

Description of the change

Converts MD5 to SHA1 sum, and version bumps from 3.0.0 to 3.1.1, the latest stable release

To post a comment you must log in.
Revision history for this message
David Britton (dpb) wrote :

Hi Charles --

This looks straightforward, but why not name the file *.sha1, instead of *.md5?

review: Needs Information
lp:~lazypower/charms/trusty/kibana/311_bump updated
13. By Charles Butler

Change .md5 to .sha1

Revision history for this message
Charles Butler (lazypower) wrote :

Thanks for the catch dpb - updated to reflect *.sha1

lp:~lazypower/charms/trusty/kibana/311_bump updated
14. By Charles Butler

Updates to reflect *.sha1

Revision history for this message
David Britton (dpb) :
review: Approve
Revision history for this message
David Britton (dpb) wrote :

with latest changes, it looks great, thanks Charles!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-04-14 15:59:48 +0000
3+++ config.yaml 2014-11-10 18:07:39 +0000
4@@ -1,13 +1,13 @@
5 options:
6 kibana_source:
7 type: string
8- default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0.tar.gz'
9+ default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.1.1.tar.gz'
10 description: URL to download the source for kibana
11 kibana_source_unpack_directory:
12 type: string
13- default: 'kibana-3.0.0'
14+ default: 'kibana-3.1.1'
15 description: the name of the directory the tar.gz will unpack to
16 kibana_source_checksum:
17 type: string
18- default: 'cef6dc8061c8800ddc5eb2725b9220c0'
19- description: the md5sum of the kibana_source
20+ default: '74c6b8b79d1bfc7e4d5376e3c9ecb0fa1e79c986'
21+ description: the sha1sum of the kibana_source
22
23=== modified file 'hooks/install'
24--- hooks/install 2013-11-26 09:44:11 +0000
25+++ hooks/install 2014-11-10 18:07:39 +0000
26@@ -1,5 +1,5 @@
27 #!/bin/bash
28-set -eux
29+set -eux
30 HOME=$PWD
31 KIBANA_SOURCE=$(config-get kibana_source)
32 KIBANA_SOURCE_UNPACK_DIRECTORY=$(config-get kibana_source_unpack_directory)
33@@ -11,8 +11,8 @@
34
35 juju-log "download kibana from elasticsearch.org"
36 wget -q -O /tmp/kibana.tgz ${KIBANA_SOURCE}
37-echo "${KIBANA_SOURCE_CHECKSUM} /tmp/kibana.tgz" > /tmp/kibana.tgz.md5
38-md5sum -c /tmp/kibana.tgz.md5
39+echo "${KIBANA_SOURCE_CHECKSUM} /tmp/kibana.tgz" > /tmp/kibana.tgz.sha1
40+sha1sum -c /tmp/kibana.tgz.sha1
41
42 install -o root -g root -m 0644 files/charm/nginx.conf /etc/nginx/sites-available/kibana
43 install -o root -g root -m 0644 files/charm/nginx_lb.conf /etc/nginx/sites-available/es_cluster

Subscribers

People subscribed via source and target branches