[MediaWiki-commits] [Gerrit] nagios: minor check_sslxNN ePN fix - change (operations/puppet)

2014-12-30 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: nagios: minor check_sslxNN ePN fix
..


nagios: minor check_sslxNN ePN fix

$PWD when running under ePN is /usr/lib/nagios, so be a bit smarter
about our @INC.

Change-Id: I9f5010c144cfccd56c0e796a73b20ee626fa9632
---
M modules/nagios_common/files/check_commands/check_sslxNN
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/nagios_common/files/check_commands/check_sslxNN 
b/modules/nagios_common/files/check_commands/check_sslxNN
index 0539867..601ee7a 100755
--- a/modules/nagios_common/files/check_commands/check_sslxNN
+++ b/modules/nagios_common/files/check_commands/check_sslxNN
@@ -36,8 +36,9 @@
 use Nagios::Plugin::Functions qw(nagios_exit max_state %STATUS_TEXT);
 
 # this is required to be in the same directory as us
-use FindBin;
-require "$FindBin::Bin/check_ssl";## no critic
+use FindBin qw($Bin);
+use lib ($Bin, "$Bin/plugins", "/usr/lib/nagios/plugins");
+require "check_ssl";## no critic
 
 sub check_ssl {
 local @ARGV = @_;

-- 
To view, visit https://gerrit.wikimedia.org/r/182348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f5010c144cfccd56c0e796a73b20ee626fa9632
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] nagios: minor check_sslxNN ePN fix - change (operations/puppet)

2014-12-30 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/182348

Change subject: nagios: minor check_sslxNN ePN fix
..

nagios: minor check_sslxNN ePN fix

$PWD when running under ePN is /usr/lib/nagios, so be a bit smarter
about our @INC.

Change-Id: I9f5010c144cfccd56c0e796a73b20ee626fa9632
---
M modules/nagios_common/files/check_commands/check_sslxNN
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/182348/1

diff --git a/modules/nagios_common/files/check_commands/check_sslxNN 
b/modules/nagios_common/files/check_commands/check_sslxNN
index 0539867..601ee7a 100755
--- a/modules/nagios_common/files/check_commands/check_sslxNN
+++ b/modules/nagios_common/files/check_commands/check_sslxNN
@@ -36,8 +36,9 @@
 use Nagios::Plugin::Functions qw(nagios_exit max_state %STATUS_TEXT);
 
 # this is required to be in the same directory as us
-use FindBin;
-require "$FindBin::Bin/check_ssl";## no critic
+use FindBin qw($Bin);
+use lib ($Bin, "$Bin/plugins", "/usr/lib/nagios/plugins");
+require "check_ssl";## no critic
 
 sub check_ssl {
 local @ARGV = @_;

-- 
To view, visit https://gerrit.wikimedia.org/r/182348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f5010c144cfccd56c0e796a73b20ee626fa9632
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits