diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oxidized/input/ssh.rb | 3 | ||||
| -rw-r--r-- | lib/oxidized/input/telnet.rb | 7 | 
2 files changed, 7 insertions, 3 deletions
| diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index b1f109b..815b8af 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -21,7 +21,8 @@ module Oxidized        @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) }        secure = CFG.input.ssh.secure        @log = File.open(CFG.input.debug?.to_s + '-ssh', 'w') if CFG.input.debug? -      @ssh = Net::SSH.start @node.ip, @node.auth[:username], +      port = vars(:ssh_port) or 22 +      @ssh = Net::SSH.start @node.ip, @node.auth[:username], :port => port.to_i,                              :password => @node.auth[:password], :timeout => CFG.timeout,                              :paranoid => secure,                              :auth_methods => %w(none publickey password keyboard-interactive), diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index 13fccf7..52d6a53 100644 --- a/lib/oxidized/input/telnet.rb +++ b/lib/oxidized/input/telnet.rb @@ -10,9 +10,12 @@ module Oxidized        @node    = node        @timeout = CFG.timeout        @node.model.cfg['telnet'].each { |cb| instance_exec(&cb) } +      port = vars(:telnet_port) or 23 -      opt = { 'Host' => @node.ip, 'Timeout' => @timeout, -              'Model' => @node.model } +      opt = { 'Host'    => @node.ip, +              'Port'    => port.to_i, +              'Timeout' => @timeout, +              'Model'   => @node.model }        opt['Output_log'] = CFG.input.debug?.to_s + '-telnet' if CFG.input.debug?        @telnet  = Net::Telnet.new opt | 
