Merge lp:~mthaddon/charms/precise/kibana/download-source into lp:charms/kibana

[Tom Haddon]

Allow us to specify the download source, actually confirm the checksum matches the downloaded source, and remove some spurious comments from hooks. Use /srv for kibana - /usr/share is for architecture-independent (shared) data per FHS.

I've done a test deploy of this charm with the some of the new config options set to confirm it works as expected.

[Jacek Nykis (jacekn)]

Everything looks fine to me.

review: Approve

=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2013-11-26 12:56:39 +0000
@@ -0,0 +1,13 @@
+options:
+    kibana_source:
+        type: string
+        default: 'https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0milestone4.tar.gz'
+        description: URL to download the source for kibana
+    kibana_source_unpack_directory:
+        type: string
+        default: 'kibana-3.0.0milestone4'
+        description: the name of the directory the tar.gz will unpack to
+    kibana_source_checksum:
+        type: string
+        default: '3ee5416c8a61fa95ba9280631a66997e'
+        description: the md5sum of the kibana_source
 
=== modified file 'files/charm/nginx.conf'
--- files/charm/nginx.conf	2013-09-29 21:58:50 +0000
+++ files/charm/nginx.conf	2013-11-26 12:56:39 +0000
@@ -5,7 +5,7 @@
   access_log /var/log/nginx/kibana.access.log;
 
   location / {
-    root /usr/share/kibana3;
+    root /srv/kibana3;
     index index.html index.htm;
   }
 
 
=== modified file 'hooks/install'
--- hooks/install	2013-09-29 21:58:50 +0000
+++ hooks/install	2013-11-26 12:56:39 +0000
@@ -1,33 +1,33 @@
 #!/bin/bash
-# Here do anything needed to install the service
-# i.e. apt-get install -y foo  or  bzr branch http://myserver/mycode /srv/webroot
-# Make sure this hook exits cleanly and is idempotent, common problems here are failing to account for a debconf question on a dependency, or trying to pull from github without installing git first.
-set -eux # -x for verbose logging to juju debug-log
+set -eux 
 HOME=$PWD
-CHECKSUM="8614d80e8afdb9d936e8574b24e9b405"
-HOST=`unit-get private-address`
+KIBANA_SOURCE=$(config-get kibana_source)
+KIBANA_SOURCE_UNPACK_DIRECTORY=$(config-get kibana_source_unpack_directory)
+KIBANA_SOURCE_CHECKSUM=$(config-get kibana_source_checksum)
+HOST=$(unit-get private-address)
 
 juju-log "install dependency"
 apt-get install -y curl wget git nginx
 
 juju-log "download kibana from elasticsearch.org"
-wget -q -O /tmp/kibana-latest.tgz https://download.elasticsearch.org/kibana/kibana/kibana-latest.tar.gz
+wget -q -O /tmp/kibana.tgz ${KIBANA_SOURCE}
+echo "${KIBANA_SOURCE_CHECKSUM}  /tmp/kibana.tgz" > /tmp/kibana.tgz.md5
+md5sum -c /tmp/kibana.tgz.md5
 
 install -o root -g root -m 0644 files/charm/nginx.conf /etc/nginx/sites-available/kibana
 install -o root -g root -m 0644 files/charm/nginx_lb.conf /etc/nginx/sites-available/es_cluster
 
-pushd /usr/share
-
-tar xzvf /tmp/kibana-latest.tgz
-
-mv kibana-latest kibana3
+pushd /srv
+
+tar xzvf /tmp/kibana.tgz
+mv ${KIBANA_SOURCE_UNPACK_DIRECTORY} kibana3
 
 rm -f /etc/nginx/sites-enabled/default
 
 popd
 
-rm -f /usr/share/kibana3/config.js
-install -o root -g root -m 0644 files/charm/config.js /usr/share/kibana3/config.js
+rm -f /srv/kibana3/config.js
+install -o root -g root -m 0644 files/charm/config.js /srv/kibana3/config.js
 
 
 ln -s /etc/nginx/sites-available/kibana /etc/nginx/sites-enabled/kibana
 
=== modified file 'hooks/rest-relation-changed'
--- hooks/rest-relation-changed	2013-09-29 21:58:50 +0000
+++ hooks/rest-relation-changed	2013-11-26 12:56:39 +0000
@@ -1,8 +1,5 @@
 #!/bin/bash
-# This must be renamed to the name of the relation. The goal here is to
-# affect any change needed by relationships being formed, modified, or broken
-# This script should be idempotent.
-set -eux # -x for verbose logging to juju debug-log
+set -eux 
 [ -z "$(relation-get cluster-name)" ] && exit 0
 
 juju-log $JUJU_REMOTE_UNIT modified its settings
 
=== modified file 'hooks/rest-relation-departed'
--- hooks/rest-relation-departed	2012-11-06 04:38:09 +0000
+++ hooks/rest-relation-departed	2013-11-26 12:56:39 +0000
@@ -1,5 +1,2 @@
 #!/bin/sh
-# This must be renamed to the name of the relation. The goal here is to
-# affect any change needed by the remote unit leaving the relationship.
-# This script should be idempotent.
 juju-log $JUJU_REMOTE_UNIT departed
 
=== modified file 'hooks/rest-relation-joined'
--- hooks/rest-relation-joined	2013-09-29 21:58:50 +0000
+++ hooks/rest-relation-joined	2013-11-26 12:56:39 +0000
@@ -1,6 +1,2 @@
 #!/bin/bash
-# This must be renamed to the name of the relation. The goal here is to
-# affect any change needed by relationships being formed
-# This script should be idempotent.
-set -eux # -x for verbose logging to juju debug-log
-juju-log $JUJU_REMOTE_UNIT joined
 \ No newline at end of file
+juju-log $JUJU_REMOTE_UNIT joined
 
=== modified file 'hooks/web-relation-joined'
--- hooks/web-relation-joined	2012-11-22 16:43:50 +0000
+++ hooks/web-relation-joined	2013-11-26 12:56:39 +0000
@@ -1,10 +1,7 @@
 #!/bin/bash
-# This must be renamed to the name of the relation. The goal here is to
-# affect any change needed by relationships being formed
-# This script should be idempotent.
-set -eux # -x for verbose logging to juju debug-log
+set -eux
 juju-log $JUJU_REMOTE_UNIT joined
 
 # Set ip/port for web relation
 relation-set port="80"
-relation-set host=`unit-get private-address`
 \ No newline at end of file
+relation-set host=`unit-get private-address`