summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Supported-OS-Types.md178
-rw-r--r--extra/oxidized-ubuntu.haproxy45
-rw-r--r--lib/oxidized/model/ciscosmb.rb2
-rw-r--r--lib/oxidized/model/fiberdriver.rb2
4 files changed, 136 insertions, 91 deletions
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index e600040..9176f2e 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -2,148 +2,148 @@
* Vendor
* OS model
* A10 Networks
- * [ACOS](lib/oxidized/model/acos.rb)
+ * [ACOS](/lib/oxidized/model/acos.rb)
* Accedian Performance Elements (NIDs)
- * [AEN](lib/oxidized/model/aen.rb)
+ * [AEN](/lib/oxidized/model/aen.rb)
* Alcatel-Lucent
- * [AOS](lib/oxidized/model/aos.rb)
- * [AOS7](lib/oxidized/model/aos7.rb)
- * [ISAM](lib/oxidized/model/isam.rb)
- * [SR OS (Formerly TiMOS)](lib/oxidized/model/timos.rb)
+ * [AOS](/lib/oxidized/model/aos.rb)
+ * [AOS7](/lib/oxidized/model/aos7.rb)
+ * [ISAM](/lib/oxidized/model/isam.rb)
+ * [SR OS (Formerly TiMOS)](/lib/oxidized/model/timos.rb)
* Wireless
* Alvarion
- * [BreezeACCESS](lib/oxidized/model/alvarion.rb)
+ * [BreezeACCESS](/lib/oxidized/model/alvarion.rb)
* APC
- * [AOS](lib/oxidized/model/apc_aos.rb)
+ * [AOS](/lib/oxidized/model/apc_aos.rb)
* Arista
- * [EOS](lib/oxidized/model/eos.rb)
+ * [EOS](/lib/oxidized/model/eos.rb)
* Arris
- * [C4CMTS](lib/oxidized/model/c4cmts.rb)
+ * [C4CMTS](/lib/oxidized/model/c4cmts.rb)
* Aruba
- * [AOSW](lib/oxidized/model/aosw.rb)
+ * [AOSW](/lib/oxidized/model/aosw.rb)
* AudioCodes
- * [AudioCodes](lib/oxdized/model/audiocodes.rb)
+ * [AudioCodes](/lib/oxdized/model/audiocodes.rb)
* Avaya
- * [VOSS (VSP Operating System Software)](lib/oxidized/model/voss.rb)
- * [BOSS (Baystack Operating System Software)](lib/oxidized/model/boss.rb)
+ * [VOSS (VSP Operating System Software)](/lib/oxidized/model/voss.rb)
+ * [BOSS (Baystack Operating System Software)](/lib/oxidized/model/boss.rb)
* Brocade
- * [FabricOS](lib/oxidized/model/fabricos.rb)
- * [Ironware](lib/oxidized/model/ironware.rb)
- * [NOS (Network Operating System)](lib/oxidized/model/nos.rb)
- * [Vyatta](lib/oxidized/model/vyatta.rb)
- * [6910](lib/oxidized/model/br6910.rb)
+ * [FabricOS](/lib/oxidized/model/fabricos.rb)
+ * [Ironware](/lib/oxidized/model/ironware.rb)
+ * [NOS (Network Operating System)](/lib/oxidized/model/nos.rb)
+ * [Vyatta](/lib/oxidized/model/vyatta.rb)
+ * [6910](/lib/oxidized/model/br6910.rb)
* Casa
- * [Casa](lib/oxidized/model/casa.rb)
+ * [Casa](/lib/oxidized/model/casa.rb)
* Check Point
- * [GaiaOS](lib/oxidized/model/gaiaos.rb)
+ * [GaiaOS](/lib/oxidized/model/gaiaos.rb)
* Ciena
- * [SAOS](lib/oxidized/model/saos.rb)
+ * [SAOS](/lib/oxidized/model/saos.rb)
* Cisco
- * [ACSW](lib/oxidized/model/acsw.rb)
- * [AireOS](lib/oxidized/model/aireos.rb)
- * [ASA](lib/oxidized/model/asa.rb)
- * [AsyncOS](lib/oxidized/model/asyncos.rb)
- * [CatOS](lib/oxidized/model/catos.rb)
- * [IOS](lib/oxidized/model/ios.rb)
- * [IOSXR](lib/oxidized/model/iosxr.rb)
- * [NGA](lib/oxidized/model/cisconga.rb)
- * [NXOS](lib/oxidized/model/nxos.rb)
- * [SMA](lib/oxidized/model/ciscosma.rb)
- * [SMB (Nikola series)](lib/oxidized/model/ciscosmb.rb)
- * [UCS](lib/oxidized/model/ucs.rb)
+ * [ACSW](/lib/oxidized/model/acsw.rb)
+ * [AireOS](/lib/oxidized/model/aireos.rb)
+ * [ASA](/lib/oxidized/model/asa.rb)
+ * [AsyncOS](/lib/oxidized/model/asyncos.rb)
+ * [CatOS](/lib/oxidized/model/catos.rb)
+ * [IOS](/lib/oxidized/model/ios.rb)
+ * [IOSXR](/lib/oxidized/model/iosxr.rb)
+ * [NGA](/lib/oxidized/model/cisconga.rb)
+ * [NXOS](/lib/oxidized/model/nxos.rb)
+ * [SMA](/lib/oxidized/model/ciscosma.rb)
+ * [SMB (Nikola series)](/lib/oxidized/model/ciscosmb.rb)
+ * [UCS](/lib/oxidized/model/ucs.rb)
* Citrix
- * [NetScaler (Virtual Applicance)](lib/oxidized/model/netscaler.rb)
+ * [NetScaler (Virtual Applicance)](/lib/oxidized/model/netscaler.rb)
* Coriant (former Tellabs)
- * [TMOS (8800)](lib/oxidized/model/corianttmos.rb)
- * [8600](lib/oxidized/model/coriant8600.rb)
- * [Groove](lib/oxidized/model/coriantgroove.rb)
+ * [TMOS (8800)](/lib/oxidized/model/corianttmos.rb)
+ * [8600](/lib/oxidized/model/coriant8600.rb)
+ * [Groove](/lib/oxidized/model/coriantgroove.rb)
* Cumulus
- * [Linux](lib/oxidized/model/cumulus.rb)
+ * [Linux](/lib/oxidized/model/cumulus.rb)
* DataCom
- * [DmSwitch 3000](lib/oxidized/model/datacom.rb)
+ * [DmSwitch 3000](/lib/oxidized/model/datacom.rb)
* DCN
- * [DCN](lib/oxidized/model/ios.rb) - Map this to ios.
+ * [DCN](/lib/oxidized/model/ios.rb) - Map this to ios.
* DELL
- * [PowerConnect](lib/oxidized/model/powerconnect.rb)
- * [AOSW](lib/oxidized/model/aosw.rb)
+ * [PowerConnect](/lib/oxidized/model/powerconnect.rb)
+ * [AOSW](/lib/oxidized/model/aosw.rb)
* D-Link
- * [D-Link](lib/oxidized/model/dlink.rb)
+ * [D-Link](/lib/oxidized/model/dlink.rb)
* Ericsson/Redback
- * [IPOS (former SEOS)](lib/oxidized/model/ipos.rb)
+ * [IPOS (former SEOS)](/lib/oxidized/model/ipos.rb)
* Extreme Networks
* [Enterasys](/lib/oxidized/model/enterasys.rb)
- * [WM](lib/oxidized/model/mtrlrfs.rb)
- * [XOS](lib/oxidized/model/xos.rb)
+ * [WM](/lib/oxidized/model/mtrlrfs.rb)
+ * [XOS](/lib/oxidized/model/xos.rb)
* F5
- * [TMOS](lib/oxidized/model/tmos.rb)
+ * [TMOS](/lib/oxidized/model/tmos.rb)
* Force10
- * [DNOS](lib/oxidized/model/dnos.rb)
- * [FTOS](lib/oxidized/model/ftos.rb)
+ * [DNOS](/lib/oxidized/model/dnos.rb)
+ * [FTOS](/lib/oxidized/model/ftos.rb)
* FortiGate
- * [FortiOS](lib/oxidized/model/fortios.rb)
+ * [FortiOS](/lib/oxidized/model/fortios.rb)
* Fujitsu
- * [PRIMERGY Blade switch 1/10Gbe](lib/oxidized/model/fujitsupy.rb)
+ * [PRIMERGY Blade switch 1/10Gbe](/lib/oxidized/model/fujitsupy.rb)
* Hatteras
- * [Hatteras](lib/oxidized/model/hatteras.rb)
+ * [Hatteras](/lib/oxidized/model/hatteras.rb)
* Hirschmann
- * [HiOS](lib/oxidized/model/hirschmann.rb)
+ * [HiOS](/lib/oxidized/model/hirschmann.rb)
* HP
- * [Comware (HP A-series, H3C, 3Com)](lib/oxidized/model/comware.rb)
- * [Procurve](lib/oxidized/model/procurve.rb)
- * [BladeSystem (Onboard Administrator)](lib/oxidized/model/hpebladesystem.rb)
- * [MSA](lib/oxidized/model/hpemsa.rb)
+ * [Comware (HP A-series, H3C, 3Com)](/lib/oxidized/model/comware.rb)
+ * [Procurve](/lib/oxidized/model/procurve.rb)
+ * [BladeSystem (Onboard Administrator)](/lib/oxidized/model/hpebladesystem.rb)
+ * [MSA](/lib/oxidized/model/hpemsa.rb)
* Huawei
- * [VRP](lib/oxidized/model/vrp.rb)
+ * [VRP](/lib/oxidized/model/vrp.rb)
* Juniper
- * [JunOS](lib/oxidized/model/junos.rb)
- * [ScreenOS (Netscreen)](lib/oxidized/model/screenos.rb)
+ * [JunOS](/lib/oxidized/model/junos.rb)
+ * [ScreenOS (Netscreen)](/lib/oxidized/model/screenos.rb)
* Mellanox
- * [MLNX-OS](lib/oxidized/model/mlnxos.rb)
- * [Voltaire](lib/oxidized/model/voltaire.rb)
+ * [MLNX-OS](/lib/oxidized/model/mlnxos.rb)
+ * [Voltaire](/lib/oxidized/model/voltaire.rb)
* Mikrotik
- * [RouterOS](lib/oxidized/model/routeros.rb)
+ * [RouterOS](/lib/oxidized/model/routeros.rb)
* Motorola
- * [RFS](lib/oxidized/model/mtrlrfs.rb)
+ * [RFS](/lib/oxidized/model/mtrlrfs.rb)
* MRV
- * [MasterOS](lib/oxidized/model/masteros.rb)
- * [FiberDriver](lib/oxidized/model/fiberdriver.rb)
+ * [MasterOS](/lib/oxidized/model/masteros.rb)
+ * [FiberDriver](/lib/oxidized/model/fiberdriver.rb)
* Netgear
- * [Netgear](lib/oxidized/model/netgear.rb)
+ * [Netgear](/lib/oxidized/model/netgear.rb)
* Netonix
- * [WISP Switch (As Netonix)](lib/oxidized/model/netonix.rb)
+ * [WISP Switch (As Netonix)](/lib/oxidized/model/netonix.rb)
* Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)
- * [SR OS (TiMOS)](lib/oxidized/model/timos.rb)
+ * [SR OS (TiMOS)](/lib/oxidized/model/timos.rb)
* OneAccess
- * [OneOS](lib/oxidized/model/oneos.rb)
+ * [OneOS](/lib/oxidized/model/oneos.rb)
* Opengear
- * [Opengear](lib/oxidized/model/opengear.rb)
+ * [Opengear](/lib/oxidized/model/opengear.rb)
* Palo Alto
- * [PANOS](lib/oxidized/model/panos.rb)
- * [PLANET SG/SGS Switches](lib/oxidized/model/planet.rb)
- * [pfSense](lib/oxidized/model/pfsense.rb)
+ * [PANOS](/lib/oxidized/model/panos.rb)
+ * [PLANET SG/SGS Switches](/lib/oxidized/model/planet.rb)
+ * [pfSense](/lib/oxidized/model/pfsense.rb)
* Radware
- * [AlteonOS](lib/oxidized/model/alteonos.rb)
+ * [AlteonOS](/lib/oxidized/model/alteonos.rb)
* Quanta
- * [Quanta / VxWorks 6.6 (1.1.0.8)](lib/oxidized/model/quantaos.rb)
+ * [Quanta / VxWorks 6.6 (1.1.0.8)](/lib/oxidized/model/quantaos.rb)
* Siklu
- * [EtherHaul](lib/oxidized/model/siklu.rb)
+ * [EtherHaul](/lib/oxidized/model/siklu.rb)
* Supermicro
- * [Supermicro](lib/oxidized/model/supermicro.rb)
+ * [Supermicro](/lib/oxidized/model/supermicro.rb)
* Symantec
- * [Blue Coat ProxySG / Security Gateway OS (SGOS)](lib/oxidized/model/sgos.rb)
+ * [Blue Coat ProxySG / Security Gateway OS (SGOS)](/lib/oxidized/model/sgos.rb)
* Trango Systems
- * [Trango](lib/oxidized/model/trango.rb)
+ * [Trango](/lib/oxidized/model/trango.rb)
* TPLink
- * [TPLink](lib/oxidized/model/tplink.rb)
+ * [TPLink](/lib/oxidized/model/tplink.rb)
* Ubiquiti
- * [AirOS](lib/oxidized/model/airos.rb)
- * [Edgeos](lib/oxidized/model/edgeos.rb)
- * [EdgeSwitch](lib/oxidized/model/edgeswitch.rb)
+ * [AirOS](/lib/oxidized/model/airos.rb)
+ * [Edgeos](/lib/oxidized/model/edgeos.rb)
+ * [EdgeSwitch](/lib/oxidized/model/edgeswitch.rb)
* Watchguard
- * [Fireware OS](lib/oxidized/model/firewareos.rb)
+ * [Fireware OS](/lib/oxidized/model/firewareos.rb)
* Westell
- * [Westell 8178G, Westell 8266G](lib/oxidized/model/weos.rb)
+ * [Westell 8178G, Westell 8266G](/lib/oxidized/model/weos.rb)
* Zhone
- * [Zhone (OLT and MX)](lib/oxidized/model/zhoneolt.rb)
+ * [Zhone (OLT and MX)](/lib/oxidized/model/zhoneolt.rb)
* Zyxel
- * [ZyNOS](lib/oxidized/model/zynos.rb)
+ * [ZyNOS](/lib/oxidized/model/zynos.rb)
diff --git a/extra/oxidized-ubuntu.haproxy b/extra/oxidized-ubuntu.haproxy
new file mode 100644
index 0000000..91b76b2
--- /dev/null
+++ b/extra/oxidized-ubuntu.haproxy
@@ -0,0 +1,45 @@
+global
+ log /dev/log local0
+ log /dev/log local1 notice
+ chroot /var/lib/haproxy
+ stats socket /run/haproxy/admin.sock mode 660 level admin
+ stats timeout 30s
+ user haproxy
+ group haproxy
+ daemon
+
+ # Default SSL material locations
+ ca-base /etc/ssl/certs
+ crt-base /etc/ssl/private
+
+ # Default ciphers to use on SSL-enabled listening sockets.
+ # For more information, see ciphers(1SSL). This list is from:
+ # https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+ ssl-default-bind-ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS
+ ssl-default-bind-options no-sslv3
+
+defaults
+ log global
+ mode http
+ option httplog
+ option dontlognull
+ timeout connect 5000
+ timeout client 50000
+ timeout server 50000
+ errorfile 400 /etc/haproxy/errors/400.http
+ errorfile 403 /etc/haproxy/errors/403.http
+ errorfile 408 /etc/haproxy/errors/408.http
+ errorfile 500 /etc/haproxy/errors/500.http
+ errorfile 502 /etc/haproxy/errors/502.http
+ errorfile 503 /etc/haproxy/errors/503.http
+ errorfile 504 /etc/haproxy/errors/504.http
+
+frontend oxidized
+ bind *:80
+ mode http
+ default_backend oxidized
+ compression algo gzip
+ compression type text/html text/plain text/css
+
+backend oxidized
+ server o1 127.0.0.1:8080
diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 5ddcfcb..9453059 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -1,6 +1,6 @@
class CiscoSMB < Oxidized::Model
- # Cisco Small Business 200, 300, 500, and ESW2 series switches
+ # Cisco Small Business 300, 500, and ESW2 series switches
# http://www.cisco.com/c/en/us/support/switches/small-business-300-series-managed-switches/products-release-notes-list.html
prompt /^\r?([\w.@()-]+[#>]\s?)$/
diff --git a/lib/oxidized/model/fiberdriver.rb b/lib/oxidized/model/fiberdriver.rb
index abe8f68..7cfa847 100644
--- a/lib/oxidized/model/fiberdriver.rb
+++ b/lib/oxidized/model/fiberdriver.rb
@@ -13,7 +13,7 @@ class FiberDriver < Oxidized::Model
cfg.each_line.to_a[3..-1].join
cfg.gsub! /^Building configuration.*$/, ''
cfg.gsub! /^Current configuration:.*$$/, ''
- cfg.gsub! /^! Configuration saved on .*$/, ''
+ cfg.gsub! /^! Configuration (saved|generated) on .*$/, ''
cfg
end