Juju Charms Collection
kibana package

Merge lp:~michael.nelson/charms/trusty/kibana/kibana4 into lp:~canonical-is-sa/charms/trusty/kibana/kibana4

  1. Trusty Tahr (14.04)
  2. kibana4
  3. Merge into kibana4
Proposed by Michael Nelson
Status: Merged
Merged at revision: 22
Proposed branch: lp:~michael.nelson/charms/trusty/kibana/kibana4
Merge into: lp:~canonical-is-sa/charms/trusty/kibana/kibana4
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/install (+1/-1)
To merge this branch: bzr merge lp:~michael.nelson/charms/trusty/kibana/kibana4
Reviewer Review Type Date Requested Status
Michael Foley (community) Approve
Review via email: mp+276610@code.launchpad.net

Commit message

Fix installed kibana config file name (to match that expected in the init file)

Description of the change

Verified this results in a successful spec run using https://code.launchpad.net/~michael.nelson/canonical-mojo-specs/mojo-is-logging-kibana-4/+merge/276487

To post a comment you must log in.
Revision history for this message
Michael Foley (foli) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2015-11-03 23:36:15 +0000
3+++ hooks/install 2015-11-04 00:48:53 +0000
4@@ -34,7 +34,7 @@
5 install -o root -g root -m 0644 files/charm/kibana_lb.conf /etc/nginx/sites-available/kibana_load_balancer
6 install -o root -g root -m 0644 files/charm/kibana.init /etc/init/kibana.conf
7 mkdir -p /etc/kibana/
8-install -o root -g root -m 0644 files/charm/config.yml /etc/kibana/kibana.conf
9+install -o root -g root -m 0644 files/charm/config.yml /etc/kibana/config.yml
10 pushd /srv
11
12 if [[ ! -d kibana4 ]]; then

Subscribers

People subscribed via source and target branches