Merge lp://staging/~yellow/charms/trusty/kibana/trunk into lp://staging/charms/trusty/kibana

Proposed by Jay R. Wren
Status: Merged
Merged at revision: 18
Proposed branch: lp://staging/~yellow/charms/trusty/kibana/trunk
Merge into: lp://staging/charms/trusty/kibana
Diff against target: 153 lines (+72/-9)
8 files modified
config.yaml (+9/-0)
hooks/config-changed (+18/-0)
hooks/install (+5/-2)
hooks/start (+1/-3)
hooks/stop (+3/-2)
hooks/web-relation-joined (+3/-1)
metadata.yaml (+1/-1)
tests/12-port-change.py (+32/-0)
To merge this branch: bzr merge lp://staging/~yellow/charms/trusty/kibana/trunk
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+262373@code.staging.launchpad.net

Description of the change

Adds nginx tcp port configuration option and a path option for configuring it to be proxy fronted with a path. e.g. /kibana and not at the root of a url.

To post a comment you must log in.
Revision history for this message
Jay R. Wren (evarlast) wrote :
24. By Jay R. Wren

close port only if previously opened

25. By Jay R. Wren

fix idempotency problems

26. By Jay R. Wren

explicitly define empty env var

Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM, I've left a comment on how you could simplify some of the logic, but otherwise +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches