diff options
| author | KodApa85 <parsons151185@gmail.com> | 2018-01-25 22:01:39 +0000 |
|---|---|---|
| committer | Neil Lathwood <neil@lathwood.co.uk> | 2018-01-25 22:01:39 +0000 |
| commit | 4e59878052f0668f4dde2282e86882626936f6b4 (patch) | |
| tree | 78d52fc6af2afbac6ef6e1be18ca3d43d9fefa2f /lib | |
| parent | 6f46eeb2b5000d3f07377655d0bcfc7c2ef36cb3 (diff) | |
model: Fixed FTP Passive/Active modes & Xyzel XGS4600 series Docs (#1161)
* FTP Passive/Active mode added
* Documentation for Xyzel XGS4600 series
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/oxidized/config.rb | 1 | ||||
| -rw-r--r-- | lib/oxidized/input/ftp.rb | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb index 23af9c2..47544fb 100644 --- a/lib/oxidized/config.rb +++ b/lib/oxidized/config.rb @@ -37,6 +37,7 @@ module Oxidized asetus.default.input.default = 'ssh, telnet' asetus.default.input.debug = false # or String for session log file asetus.default.input.ssh.secure = false # complain about changed certs + asetus.default.input.ftp.passive= true # ftp passive mode asetus.default.output.default = 'file' # file, git asetus.default.source.default = 'csv' # csv, sql diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb index 80de257..cdf3688 100644 --- a/lib/oxidized/input/ftp.rb +++ b/lib/oxidized/input/ftp.rb @@ -19,7 +19,9 @@ module Oxidized @node = node @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) } @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug? - @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password] + @ftp = Net::FTP.new(@node.ip) + @ftp.passive = Oxidized.config.input.ftp.passive + @ftp.login @node.auth[:username], @node.auth[:password] connected? end |