From e3f1cc86a6240f848eb3fa24e0dba151b42c88be Mon Sep 17 00:00:00 2001 From: Sten Spans Date: Wed, 5 Apr 2017 09:53:07 +0200 Subject: Update slackdiff.rb Add proxy option to slackdiff hook --- lib/oxidized/hook/slackdiff.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/oxidized/hook') diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb index b37c9c4..61f1743 100644 --- a/lib/oxidized/hook/slackdiff.rb +++ b/lib/oxidized/hook/slackdiff.rb @@ -10,7 +10,11 @@ class SlackDiff < Oxidized::Hook if ctx.node if ctx.event.to_s == "post_store" log "Connecting to slack" - client = Slack::Client.new token: cfg.token + Slack.configure do |config| + config.token = cfg.token + config.proxy = cfg.proxy if cfg.has_key?('proxy') + end + client = Slack::Client.new client.auth_test log "Connected" gitoutput = ctx.node.output.new -- cgit v1.2.1 From e201b4c653c5145f70dfdf9d4f1c63d3bc6ad5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Heum=C3=BCller?= Date: Thu, 11 May 2017 15:39:55 +0200 Subject: Added OX_NODE_IP for hook type: exec Added OX_NODE_IP to access the IP address for exec commands. --- lib/oxidized/hook/exec.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/oxidized/hook') diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb index 58d6fd5..fa8aff1 100644 --- a/lib/oxidized/hook/exec.rb +++ b/lib/oxidized/hook/exec.rb @@ -67,6 +67,7 @@ class Exec < Oxidized::Hook if ctx.node env.merge!( "OX_NODE_NAME" => ctx.node.name.to_s, + "OX_NODE_IP" => ctx.node.ip.to_s, "OX_NODE_FROM" => ctx.node.from.to_s, "OX_NODE_MSG" => ctx.node.msg.to_s, "OX_NODE_GROUP" => ctx.node.group.to_s, -- cgit v1.2.1