Juju Charms Collection
nagios package

Merge lp:~majduk/charms/trusty/nagios/branch into lp:charms/trusty/nagios

  1. Trusty Tahr (14.04)
  2. branch
  3. Merge into trunk
Proposed by Michał Ajduk
Status: Merged
Merged at revision: 37
Proposed branch: lp:~majduk/charms/trusty/nagios/branch
Merge into: lp:charms/trusty/nagios
Diff against target: 15 lines (+2/-2)
1 file modified
hooks/install (+2/-2)
To merge this branch: bzr merge lp:~majduk/charms/trusty/nagios/branch
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Marco Ceppi (community) Approve
Review via email: mp+304492@code.launchpad.net

Description of the change

Additional tests before removing config files to avoid an error when these are missing

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM +1

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5473/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5574/

review: Needs Fixing (automated testing)

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-10-08 18:40:52 +0000
3+++ hooks/install 2016-08-31 13:20:16 +0000
4@@ -32,9 +32,9 @@
5 # Write the new hostgroups_nagios2.cfg file to prevent servers being classified as Debian.
6 cp -v $CHARM_DIR/files/hostgroups_nagios2.cfg /etc/nagios3/conf.d/hostgroups_nagios2.cfg
7 # Remove the services configuration file to eliminiate the need for ssh and localhost groups.
8- rm -v /etc/nagios3/conf.d/services_nagios2.cfg
9+ test -f /etc/nagios3/conf.d/services_nagios2.cfg && rm -v /etc/nagios3/conf.d/services_nagios2.cfg
10 # Remove the ext file to eliminate the need for ssh and localhost groups.
11- rm -v /etc/nagios3/conf.d/extinfo_nagios2.cfg
12+ test -f /etc/nagios3/conf.d/extinfo_nagios2.cfg && rm -v /etc/nagios3/conf.d/extinfo_nagios2.cfg
13 fi
14
15 enable_livestatus=$(config-get enable_livestatus)

Subscribers

People subscribed via source and target branches

to all changes: