1 files changed, 21 insertions, 5 deletions
diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index a92ad5e..c729126 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -6,11 +6,23 @@ class RouterOS < Oxidized::Model
     comment cfg
   end
 
-  cmd '/export' do |cfg|
-    cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
-    cfg.gsub! /\\\r\n\s+/, ''   # strip new line
-    cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
-    cfg.join("\n") + "\n"
+  cmd '/system package update print' do |cfg|
+    comment cfg
+  end
+
+  cmd '/system history print' do |cfg|
+    comment cfg
+  end
+
+  post do
+    run_cmd = vars(:remove_secret) ? '/export hide-sensitive' : '/export'
+    cmd run_cmd do |cfg|
+      cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
+      cfg.gsub! /\\\r\n\s+/, '' # strip new line
+      cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
+      cfg = cfg.split("\n").reject { |line| line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+      cfg.join("\n") + "\n"
+    end
   end
 
   cfg :telnet do
@@ -18,6 +30,10 @@ class RouterOS < Oxidized::Model
     password /^Password:/
   end
 
+  cfg :telnet, :ssh do
+    pre_logout 'quit'
+  end
+
   cfg :ssh do
     exec true
   end