nagios-charmers team mailing list archive
-
nagios-charmers team
-
Mailing list archive
-
Message #00016
[Merge] ~xavpaice/nagios-charm:fix-lp1666763 into nagios-charm:master
Xav Paice has proposed merging ~xavpaice/nagios-charm:fix-lp1666763 into nagios-charm:master.
Requested reviews:
Nagios Charm developers (nagios-charmers)
For more details, see:
https://code.launchpad.net/~xavpaice/nagios-charm/+git/nagios-charm/+merge/326195
bug fix for https://bugs.launchpad.net/charms/+source/nagios/+bug/1666763
--
Your team Nagios Charm developers is requested to review the proposed merge of ~xavpaice/nagios-charm:fix-lp1666763 into nagios-charm:master.
diff --git a/files/pagerduty_nagios.pl b/files/pagerduty_nagios.pl
old mode 100644
new mode 100755
index 714fce2..714fce2
--- a/files/pagerduty_nagios.pl
+++ b/files/pagerduty_nagios.pl
diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
index 9aff222..56b80c4 100755
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -131,7 +131,7 @@ def enable_pagerduty_config():
f2.write(t2.render(template_values))
# Ship the pagerduty_nagios.pl script
- shutil.copyfile('files/pagerduty_nagios.pl', '/usr/local/bin/pagerduty_nagios.pl')
+ shutil.copy('files/pagerduty_nagios.pl', '/usr/local/bin/pagerduty_nagios.pl')
# Create the pagerduty queue dir
if not os.path.isdir(pagerduty_path):
Follow ups