Lcarr has submitted this change and it was merged.
Change subject: Revert "Fixed the path to icinga cmd file all around +file"
......................................................................
Revert "Fixed the path to icinga cmd file all around +file"
This is hard coded in several nagios plugins
This reverts commit 0bc33d61825a434d9e2779b3e2c496888c758b96.
Change-Id: I82ccb534f3524c76e7cbc2d920655e931f874302
---
M files/icinga/icinga.cfg
M files/icinga/submit_check_result
M manifests/misc/icinga.pp
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/icinga/icinga.cfg b/files/icinga/icinga.cfg
index a069c64..ee296c9 100644
--- a/files/icinga/icinga.cfg
+++ b/files/icinga/icinga.cfg
@@ -174,7 +174,7 @@
# Debian Users: In case you didn't read README.Debian yet, _NOW_ is the
# time to do it.
-command_file=/var/spool/icinga/cmd
+command_file=/var/lib/nagios/rw/nagios.cmd
diff --git a/files/icinga/submit_check_result b/files/icinga/submit_check_result
index 1d1d2c9..10c04e3 100755
--- a/files/icinga/submit_check_result
+++ b/files/icinga/submit_check_result
@@ -26,7 +26,7 @@
echocmd="/bin/echo"
-CommandFile="/var/spool/icinga/cmd"
+CommandFile="/var/lib/nagios/rw/nagios.cmd"
# get the current date/time in seconds since UNIX epoch
datetime=`date +%s`
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 494ced5..9f84c43 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -250,7 +250,7 @@
group => 'www-data',
mode => '0775';
- '/var/spool/icinga/':
+ '/var/lib/nagios/rw':
ensure => directory,
owner => 'icinga',
group => 'nagios',
@@ -285,7 +285,7 @@
command => '/bin/chmod -R a+w /var/lib/nagios';
'fix_icinga_command_file':
- command => '/bin/chmod a+rw /var/spool/icinga/cmd';
+ command => '/bin/chmod a+rw /var/lib/nagios/rw/nagios.cmd';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/78200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82ccb534f3524c76e7cbc2d920655e931f874302
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
