From 2b4ac29628556587a7763c0c8403505a3c999f7c Mon Sep 17 00:00:00 2001 From: Bert Roelofsen <19684880+systeembeheerder@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:52:13 +0200 Subject: [PATCH 1/2] add RouterOS model maintainer --- docs/Model-Notes/RouterOS.md | 15 +++++++++++++++ docs/Supported-OS-Types.md | 18 +++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 docs/Model-Notes/RouterOS.md diff --git a/docs/Model-Notes/RouterOS.md b/docs/Model-Notes/RouterOS.md new file mode 100644 index 000000000..7f3f5a610 --- /dev/null +++ b/docs/Model-Notes/RouterOS.md @@ -0,0 +1,15 @@ +# Mikrotik RouterOS Configuration + +RouterOS 7.12 and later support ED25519 keys. + +Create a key pair, save the public key (``id_ed25519.pub``) and save it on flash. Create a user +and attach the public key. + +```text +[admin@mikrotik] > /user add name=oxidized group=read disabled=no +[admin@mikrotik] > /user ssh-keys import public-key-file=id_ed25519.pub user=oxidized +``` + +Oxidized can now retrieve your configuration! + +Back to [Model-Notes](README.md) diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md index ec060502a..dd14b1e45 100644 --- a/docs/Supported-OS-Types.md +++ b/docs/Supported-OS-Types.md @@ -16,7 +16,7 @@ |Allied Telesis |Alliedware Plus |[awplus](/lib/oxidized/model/awplus.rb) | |AT-8000S, AT-8000GS series |[powerconnect](/lib/oxidized/model/powerconnect.rb) |Alvarion |BreezeACCESS |[alvarion](/lib/oxidized/model/alvarion.rb) -|APC |AOS |[apc_aos](/lib/oxidized/model/apc_aos.rb) |@robertcheramy |[APC AOS](Model-Notes/APC_AOS.md) +|APC |AOS |[apc_aos](/lib/oxidized/model/apc_aos.rb) |Arbor Networks |ArbOS |[arbos](/lib/oxidized/model/arbos.rb) | |[ArbOS](Model-Notes/ArbOS.md) |Arista |EOS |[eos](/lib/oxidized/model/eos.rb) | |[EOS](Model-Notes/EOS.md) |Arris |C4CMTS |[c4cmts](/lib/oxidized/model/c4cmts.rb) @@ -49,6 +49,7 @@ | |CatOS |[catos](/lib/oxidized/model/catos.rb) | |Cisco Catalyst Express |[ciscoce](/lib/oxidized/model/ciscoce.rb) | |FireLinuxOS |[firelinuxos](/lib/oxidized/model/firelinuxos.rb) +|Fiberstore (fs.com) |FSOS |[fsos](/lib/oxidized/model/fsos.rb) | |[FSOS](Model-Notes/FSOS.md) | |IOS |[ios](/lib/oxidized/model/ios.rb) |@robertcheramy |[IOS](Model-Notes/IOS.md) | |IOSXR |[iosxr](/lib/oxidized/model/iosxr.rb) | |NGA |[cisconga](/lib/oxidized/model/cisconga.rb) @@ -82,20 +83,17 @@ | |Enterasys 800-Series |[enterasys800](/lib/oxidized/model/enterasys800.rb) | |WM |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb) | |XOS, ExtremeWare |[xos](/lib/oxidized/model/xos.rb) -|F5 |F5OS |[tmos](/lib/oxidized/model/f5os.rb) -| |TMOS |[tmos](/lib/oxidized/model/tmos.rb) -|Fiberstore (fs.com) |S3400 |[fsos](/lib/oxidized/model/fsos.rb) | |[FSOS](Model-Notes/FSOS.md) -| |S3800 |[gcombnps](/lib/oxidized/model/gcombnps.rb) +|F5 |TMOS |[tmos](/lib/oxidized/model/tmos.rb) +|Fiberstore |S3800 |[gcombnps](/lib/oxidized/model/gcombnps.rb) | |S3900 |[edgecos](/lib/oxidized/model/edgecos.rb) | |S3900-R |[bdcom](/lib/oxidized/model/bdcom.rb) | |S5800, S5850 |[cnos](/lib/oxidized/model/cnos.rb) |Firebrick |FBxxxx |[firebrick](/lib/oxidized/model/firebrick.rb) |Force10 |DNOS |[dnos](/lib/oxidized/model/dnos.rb) | |FTOS |[ftos](/lib/oxidized/model/ftos.rb) -|FortiGate |FortiOS |[fortios](/lib/oxidized/model/fortios.rb) | |[FortiOS](Model-Notes/FortiOS.md) +|FortiGate |FortiOS |[fortios](/lib/oxidized/model/fortios.rb) |FortiWLC |FortiWLC |[fortiwlc](/lib/oxidized/model/fortiwlc.rb) |Fujitsu |PRIMERGY Blade switch 1/10Gbe |[fujitsupy](/lib/oxidized/model/fujitsupy.rb) -| |1FINITY Switches |[onefinity](/lib/oxidized/model/onefinity.rb) |GCOM Technologies |Broadband Network Platform Software|[gcombnps](/lib/oxidized/model/gcombnps.rb) |Grandstream Networks|GSX |[grandstream](/lib/oxidized/model/grandstream.rb) |Hatteras |Hatteras |[hatteras](/lib/oxidized/model/hatteras.rb) @@ -120,7 +118,7 @@ |Linuxgeneric |CentOS |[linuxgeneric](/lib/oxidized/model/linuxgeneric.rb)| |[LinuxGeneric](Model-Notes/LinuxGeneric.md) |Mellanox |MLNX-OS |[mlnxos](/lib/oxidized/model/mlnxos.rb) | |Voltaire |[voltaire](/lib/oxidized/model/voltaire.rb) -|Mikrotik |RouterOS |[routeros](/lib/oxidized/model/routeros.rb) +|Mikrotik |RouterOS |[routeros](/lib/oxidized/model/routeros.rb) |@systeembeheerder |[RouterOS](Model-Notes/RouterOSmd) | |SwOS and SwOS Lite |[swos](/lib/oxidized/model/swos.rb) |Mimosa |Mimosa (B11) |[mimosab11](/lib/oxidized/model/mimosab11.rb) |Motorola |RFS |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb) @@ -146,8 +144,7 @@ |Ruijie Networks |RGOS |[rgos](/lib/oxidized/model/rgos.rb) |QTECH |QSW-2800, QSW-3400, QSW-3450, QSW-3500|[qtech](/lib/oxidized/model/qtech.rb) |Quanta |Quanta / VxWorks 6.6 (1.1.0.8)|[quantaos](/lib/oxidized/model/quantaos.rb) -|Siklu |EtherHaul |[siklu](/lib/oxidized/model/siklu.rb) |@bdg-robert -| |Multihaul TG |[siklumhtg](/lib/oxidized/model/siklumhtg.rb) |@bdg-robert |[Siklu Multihaul TG](Model-Notes/SikluMHTG.md) +|Siklu |EtherHaul |[siklu](/lib/oxidized/model/siklu.rb) |Seiko Solutions |SmartCS, SmartCS mini |[smartcs](/lib/oxidized/model/smartcs.rb) |SonicWALL |SonicOS |[sonicos](/lib/oxidized/model/sonicos.rb) |SNR |SNR-S300G, S2xxx, S3xxx, S4xxx|[dcnos](/lib/oxidized/model/dcnos.rb) @@ -169,7 +166,6 @@ | |AirFiber |[airfiber](/lib/oxidized/model/airfiber.rb) |VMWare |NSX Edge (configuration) |[nsxconfig](/lib/oxidized/model/nsxconfig.rb) | |NSX Edge (firewall rules) |[nsxfirewall](/lib/oxidized/model/nsxfirewall.rb) -| |NSX Distributed Firewall |[nsxdfw](/lib/oxidized/model/nsxdfw.rb) |Watchguard |Fireware OS |[firewareos](/lib/oxidized/model/firewareos.rb) |Westell |Westell 8178G, Westell 8266G |[weos](/lib/oxidized/model/weos.rb) |YAMAHA |YAMAHA NVR/RTX Series |[yamaha](/lib/oxidized/model/yamaha.rb) From cbbecfd48c6bad5eff7012d6a929a57b4c902ac5 Mon Sep 17 00:00:00 2001 From: Bert Roelofsen <19684880+systeembeheerder@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:58:08 +0200 Subject: [PATCH 2/2] add upstream changed back in --- docs/Supported-OS-Types.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md index dd14b1e45..2a50aa849 100644 --- a/docs/Supported-OS-Types.md +++ b/docs/Supported-OS-Types.md @@ -16,7 +16,7 @@ |Allied Telesis |Alliedware Plus |[awplus](/lib/oxidized/model/awplus.rb) | |AT-8000S, AT-8000GS series |[powerconnect](/lib/oxidized/model/powerconnect.rb) |Alvarion |BreezeACCESS |[alvarion](/lib/oxidized/model/alvarion.rb) -|APC |AOS |[apc_aos](/lib/oxidized/model/apc_aos.rb) +|APC |AOS |[apc_aos](/lib/oxidized/model/apc_aos.rb) |@robertcheramy |[APC AOS](Model-Notes/APC_AOS.md) |Arbor Networks |ArbOS |[arbos](/lib/oxidized/model/arbos.rb) | |[ArbOS](Model-Notes/ArbOS.md) |Arista |EOS |[eos](/lib/oxidized/model/eos.rb) | |[EOS](Model-Notes/EOS.md) |Arris |C4CMTS |[c4cmts](/lib/oxidized/model/c4cmts.rb) @@ -49,7 +49,6 @@ | |CatOS |[catos](/lib/oxidized/model/catos.rb) | |Cisco Catalyst Express |[ciscoce](/lib/oxidized/model/ciscoce.rb) | |FireLinuxOS |[firelinuxos](/lib/oxidized/model/firelinuxos.rb) -|Fiberstore (fs.com) |FSOS |[fsos](/lib/oxidized/model/fsos.rb) | |[FSOS](Model-Notes/FSOS.md) | |IOS |[ios](/lib/oxidized/model/ios.rb) |@robertcheramy |[IOS](Model-Notes/IOS.md) | |IOSXR |[iosxr](/lib/oxidized/model/iosxr.rb) | |NGA |[cisconga](/lib/oxidized/model/cisconga.rb) @@ -83,17 +82,20 @@ | |Enterasys 800-Series |[enterasys800](/lib/oxidized/model/enterasys800.rb) | |WM |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb) | |XOS, ExtremeWare |[xos](/lib/oxidized/model/xos.rb) -|F5 |TMOS |[tmos](/lib/oxidized/model/tmos.rb) -|Fiberstore |S3800 |[gcombnps](/lib/oxidized/model/gcombnps.rb) +|F5 |F5OS |[tmos](/lib/oxidized/model/f5os.rb) +| |TMOS |[tmos](/lib/oxidized/model/tmos.rb) +|Fiberstore (fs.com) |S3400 |[fsos](/lib/oxidized/model/fsos.rb) | |[FSOS](Model-Notes/FSOS.md) +| |S3800 |[gcombnps](/lib/oxidized/model/gcombnps.rb) | |S3900 |[edgecos](/lib/oxidized/model/edgecos.rb) | |S3900-R |[bdcom](/lib/oxidized/model/bdcom.rb) | |S5800, S5850 |[cnos](/lib/oxidized/model/cnos.rb) |Firebrick |FBxxxx |[firebrick](/lib/oxidized/model/firebrick.rb) |Force10 |DNOS |[dnos](/lib/oxidized/model/dnos.rb) | |FTOS |[ftos](/lib/oxidized/model/ftos.rb) -|FortiGate |FortiOS |[fortios](/lib/oxidized/model/fortios.rb) +|FortiGate |FortiOS |[fortios](/lib/oxidized/model/fortios.rb) | |[FortiOS](Model-Notes/FortiOS.md) |FortiWLC |FortiWLC |[fortiwlc](/lib/oxidized/model/fortiwlc.rb) |Fujitsu |PRIMERGY Blade switch 1/10Gbe |[fujitsupy](/lib/oxidized/model/fujitsupy.rb) +| |1FINITY Switches |[onefinity](/lib/oxidized/model/onefinity.rb) |GCOM Technologies |Broadband Network Platform Software|[gcombnps](/lib/oxidized/model/gcombnps.rb) |Grandstream Networks|GSX |[grandstream](/lib/oxidized/model/grandstream.rb) |Hatteras |Hatteras |[hatteras](/lib/oxidized/model/hatteras.rb) @@ -118,7 +120,7 @@ |Linuxgeneric |CentOS |[linuxgeneric](/lib/oxidized/model/linuxgeneric.rb)| |[LinuxGeneric](Model-Notes/LinuxGeneric.md) |Mellanox |MLNX-OS |[mlnxos](/lib/oxidized/model/mlnxos.rb) | |Voltaire |[voltaire](/lib/oxidized/model/voltaire.rb) -|Mikrotik |RouterOS |[routeros](/lib/oxidized/model/routeros.rb) |@systeembeheerder |[RouterOS](Model-Notes/RouterOSmd) +|Mikrotik |RouterOS |[routeros](/lib/oxidized/model/routeros.rb) |@systeembeheerder |[RouterOS](Model-Notes/RouterOS.md) | |SwOS and SwOS Lite |[swos](/lib/oxidized/model/swos.rb) |Mimosa |Mimosa (B11) |[mimosab11](/lib/oxidized/model/mimosab11.rb) |Motorola |RFS |[mtrlrfs](/lib/oxidized/model/mtrlrfs.rb) @@ -144,7 +146,8 @@ |Ruijie Networks |RGOS |[rgos](/lib/oxidized/model/rgos.rb) |QTECH |QSW-2800, QSW-3400, QSW-3450, QSW-3500|[qtech](/lib/oxidized/model/qtech.rb) |Quanta |Quanta / VxWorks 6.6 (1.1.0.8)|[quantaos](/lib/oxidized/model/quantaos.rb) -|Siklu |EtherHaul |[siklu](/lib/oxidized/model/siklu.rb) +|Siklu |EtherHaul |[siklu](/lib/oxidized/model/siklu.rb) |@bdg-robert +| |Multihaul TG |[siklumhtg](/lib/oxidized/model/siklumhtg.rb) |@bdg-robert |[Siklu Multihaul TG](Model-Notes/SikluMHTG.md) |Seiko Solutions |SmartCS, SmartCS mini |[smartcs](/lib/oxidized/model/smartcs.rb) |SonicWALL |SonicOS |[sonicos](/lib/oxidized/model/sonicos.rb) |SNR |SNR-S300G, S2xxx, S3xxx, S4xxx|[dcnos](/lib/oxidized/model/dcnos.rb) @@ -166,6 +169,7 @@ | |AirFiber |[airfiber](/lib/oxidized/model/airfiber.rb) |VMWare |NSX Edge (configuration) |[nsxconfig](/lib/oxidized/model/nsxconfig.rb) | |NSX Edge (firewall rules) |[nsxfirewall](/lib/oxidized/model/nsxfirewall.rb) +| |NSX Distributed Firewall |[nsxdfw](/lib/oxidized/model/nsxdfw.rb) |Watchguard |Fireware OS |[firewareos](/lib/oxidized/model/firewareos.rb) |Westell |Westell 8178G, Westell 8266G |[weos](/lib/oxidized/model/weos.rb) |YAMAHA |YAMAHA NVR/RTX Series |[yamaha](/lib/oxidized/model/yamaha.rb)