Nagios Charm

Merge ~xavpaice/charm-nagios:lp1623658 into ~nagios-charmers/charm-nagios:master

  1. Git
  2. lp:~xavpaice/charm-nagios
  3. lp1623658
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Merge reported by: Xav Paice
Merged at revision: fe3ac8bb1556227e63051d71fe7bbb1a497a5996
Proposed branch: ~xavpaice/charm-nagios:lp1623658
Merge into: ~nagios-charmers/charm-nagios:master
Diff against target: 13 lines (+1/-1)
1 file modified
hooks/upgrade-charm (+1/-1)
Reviewer Review Type Date Requested Status
Jill Rouleau (community) lgtm Approve
Review via email: mp+329344@code.launchpad.net

Description of the change

fix for https://bugs.launchpad.net/nagios-charm/+bug/1623658

To post a comment you must log in.
Revision history for this message
Jill Rouleau (jillrouleau) :
review: Approve (lgtm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
2index d6f03e3..9ba994b 100755
3--- a/hooks/upgrade-charm
4+++ b/hooks/upgrade-charm
5@@ -106,7 +106,7 @@ def enable_livestatus_config():
6 os.chown(livestatus_dir, uid, gid)
7 st = os.stat(livestatus_path)
8 os.chmod(livestatus_path, st.st_mode | stat.S_IRGRP)
9- os.chmod(livestatus_dir, st.st_mode | stat.S_IRGRP | stat.S_ISGID)
10+ os.chmod(livestatus_dir, st.st_mode | stat.S_IRGRP | stat.S_ISGID | stat.S_IXUSR | stat.S_IXGRP)
11
12
13 def enable_pagerduty_config():

Subscribers

People subscribed via source and target branches