diff options
author | Wild Kat <wk@futureinquestion.net> | 2018-04-27 12:37:26 +0200 |
---|---|---|
committer | Wild Kat <wk@futureinquestion.net> | 2018-04-27 12:37:26 +0200 |
commit | 8f1ac4ad5503ac4a59d41ebc3f142c1d5d097bfb (patch) | |
tree | 8860b268793dd783b9b5cd5d1a255fe1edebfb0e /lib/oxidized/config.rb | |
parent | cd92bac4a582eb8e19d9d036455591c9684eae72 (diff) | |
parent | 34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff) |
Merge remote-tracking branch 'upstream/master' into pr-1280
Diffstat (limited to 'lib/oxidized/config.rb')
-rw-r--r-- | lib/oxidized/config.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb index 47544fb..9eb9b90 100644 --- a/lib/oxidized/config.rb +++ b/lib/oxidized/config.rb @@ -13,7 +13,7 @@ module Oxidized HookDir = File.join Directory, %w(lib oxidized hook) Sleep = 1 - def self.load(cmd_opts={}) + def self.load(cmd_opts = {}) asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true) Oxidized.asetus = asetus @@ -34,10 +34,11 @@ module Oxidized asetus.default.models = {} # model level configuration asetus.default.pid = File.join(Oxidized::Config::Root, 'pid') - 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.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.input.utf8_encoded = true # configuration is utf8 encoded or ascii-8bit asetus.default.output.default = 'file' # file, git asetus.default.source.default = 'csv' # csv, sql |