Merge branch 'master' into FortiOS-Push

1 files changed, 26 insertions, 32 deletions

diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb
index 20acb8a..334e1e4 100644
--- a/lib/oxidized/model/cumulus.rb
+++ b/lib/oxidized/model/cumulus.rb
@@ -1,85 +1,81 @@
 class Cumulus < Oxidized::Model
-  
   prompt /^((\w*)@(.*)):/
-  comment  '# '
-  
-  
-  #add a comment in the final conf
+  comment '# '
+
+  # add a comment in the final conf
   def add_comment comment
-    "\n###### #{comment} ######\n" 
+    "\n###### #{comment} ######\n"
   end
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
-  
-  #show the persistent configuration
+
+  # show the persistent configuration
   pre do
     cfg = add_comment 'THE HOSTNAME'
     cfg += cmd 'cat /etc/hostname'
-    
+
     cfg += add_comment 'THE HOSTS'
     cfg += cmd 'cat /etc/hosts'
-    
+
     cfg += add_comment 'THE INTERFACES'
     cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
-    
+
     cfg += add_comment 'RESOLV.CONF'
     cfg += cmd 'cat /etc/resolv.conf'
-    
+
     cfg += add_comment 'NTP.CONF'
     cfg += cmd 'cat /etc/ntp.conf'
-    
+
     cfg += add_comment 'IP Routes'
     cfg += cmd 'netstat -rn'
-    
+
     cfg += add_comment 'SNMP settings'
     cfg += cmd 'cat /etc/snmp/snmpd.conf'
-    
+
     cfg += add_comment 'QUAGGA DAEMONS'
     cfg += cmd 'cat /etc/quagga/daemons'
-    
+
     cfg += add_comment 'QUAGGA ZEBRA'
     cfg += cmd 'cat /etc/quagga/zebra.conf'
-    
+
     cfg += add_comment 'QUAGGA BGP'
     cfg += cmd 'cat /etc/quagga/bgpd.conf'
-    
+
     cfg += add_comment 'QUAGGA OSPF'
     cfg += cmd 'cat /etc/quagga/ospfd.conf'
-    
+
     cfg += add_comment 'QUAGGA OSPF6'
     cfg += cmd 'cat /etc/quagga/ospf6d.conf'
-    
+
     cfg += add_comment 'QUAGGA CONF'
     cfg += cmd 'cat /etc/quagga/Quagga.conf'
-    
+
     cfg += add_comment 'MOTD'
     cfg += cmd 'cat /etc/motd'
-    
+
     cfg += add_comment 'PASSWD'
     cfg += cmd 'cat /etc/passwd'
-    
+
     cfg += add_comment 'SWITCHD'
     cfg += cmd 'cat /etc/cumulus/switchd.conf'
-    
+
     cfg += add_comment 'PORTS'
     cfg += cmd 'cat /etc/cumulus/ports.conf'
-    
+
     cfg += add_comment 'TRAFFIC'
     cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'
-   	
+
     cfg += add_comment 'ACL'
     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
-  
 
   cfg :telnet do
     username /^Username:/
@@ -89,6 +85,4 @@ class Cumulus < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
- 
-
 end