2 files changed, 37 insertions, 4 deletions

diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb
index 68d856e..dc6792a 100644
--- a/lib/oxidized/model/cumulus.rb
+++ b/lib/oxidized/model/cumulus.rb
@@ -1,6 +1,6 @@
 class Cumulus < Oxidized::Model
   
-  prompt /^((\w*)@(.*)([>#]\s)+)$/
+  prompt /^((\w*)@(.*)):/
   comment  '# '
   
   
@@ -22,7 +22,7 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/hosts'
     
     cfg += add_comment 'THE INTERFACES'
-    cfg += cmd 'cat /etc/network/interfaces'
+    cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
     
     cfg += add_comment 'RESOLV.CONF'
     cfg += cmd 'cat /etc/resolv.conf'
@@ -30,6 +30,9 @@ class Cumulus < Oxidized::Model
     cfg += add_comment 'NTP.CONF'
     cfg += cmd 'cat /etc/ntp.conf'
     
+    cfg += add_comment 'IP Routes'
+    cfg += cmd 'netstat -rn'
+
     cfg += add_comment 'QUAGGA DAEMONS'
     cfg += cmd 'cat /etc/quagga/daemons'
     
@@ -55,10 +58,13 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/cumulus/switchd.conf'
     
     cfg += add_comment 'ACL'
-    cfg += cmd 'iptables -L'
+    cfg += cmd 'iptables -L -n'
     
     cfg += add_comment 'VERSION'
     cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+
+    cfg += add_comment 'License'
+    cfg += cmd 'cl-license'
     
   end
   
@@ -73,4 +79,4 @@ class Cumulus < Oxidized::Model
   end
  
 
-end
\ No newline at end of file
+end
diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
new file mode 100644
index 0000000..8cb0118
--- /dev/null
+++ b/lib/oxidized/model/pfsense.rb
@@ -0,0 +1,27 @@
+class PfSense < Oxidized::Model
+
+  # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
+  
+  comment  '# '
+  
+  #add a comment in the final conf
+  def add_comment comment
+    "\n###### #{comment} ######\n" 
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+  
+  #show the persistent configuration
+  pre do
+    cfg = add_comment 'Configuration'
+    cfg += cmd 'cat /cf/conf/config.xml'    
+  end
+  
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+ 
+end