diff --git a/router.nix b/router.nix index 63ed4cc..c676be2 100644 --- a/router.nix +++ b/router.nix @@ -5,127 +5,104 @@ comment = "defconf"; name = "bridge"; } + { name = "wifi"; } ]; "/interface list" = [ - { - comment = "defconf"; - name = "WAN"; - } - { - comment = "defconf"; - name = "LAN"; - } - ]; - "/interface wireless security-profiles" = [ - { - find.default = "yes"; - supplicant-identity = "MikroTik"; - } + { name = "WAN"; } + { name = "LAN"; } ]; "/ip pool" = [ { - name = "default-dhcp"; - ranges = "192.168.88.10-192.168.88.254"; + name = "wired-pool"; + ranges = "10.10.10.10-10.10.10.254"; + } + { + name = "wifi-pool"; + ranges = "10.10.11.10-10.10.11.254"; } ]; "/ip dhcp-server" = [ { - address-pool = "default-dhcp"; + address-pool = "wired-pool"; disabled = "no"; interface = "bridge"; - name = "defconf"; + name = "wired-dhcp"; + } + { + address-pool = "wifi-pool"; + disabled = "no"; + interface = "wifi"; + name = "wifi-dhcp"; } ]; "/interface bridge port" = [ { bridge = "bridge"; - comment = "defconf"; interface = "ether2"; } { bridge = "bridge"; - comment = "defconf"; interface = "ether3"; } { bridge = "bridge"; - comment = "defconf"; interface = "ether4"; } { - bridge = "bridge"; - comment = "defconf"; + bridge = "wifi"; interface = "ether5"; } + { + bridge = "bridge"; + interface = "sfp1"; + } ]; "/ip neighbor discovery-settings" = { discover-interface-list = "LAN"; }; - "/interface ethernet switch vlan" = [ - { - "independent-learning" = "no"; - ports = "ether2,ether3"; - switch = "switch1"; - "vlan-id" = "20"; - } - { - "independent-learning" = "no"; - ports = "ether4"; - switch = "switch1"; - "vlan-id" = "30"; - } - { - "independent-learning" = "no"; - ports = "ether5"; - switch = "switch1"; - "vlan-id" = "40"; - } - ]; "/interface list member" = [ { - comment = "defconf"; interface = "bridge"; list = "LAN"; } { - comment = "defconf"; interface = "ether1"; list = "WAN"; } ]; "/ip address" = [ { - address = "192.168.88.1/24"; - comment = "defconf"; + address = "10.10.10.1/24"; interface = "bridge"; - network = "192.168.88.0"; + network = "10.10.10.0"; + } + { + address = "10.10.11.1/24"; + interface = "wifi"; + network = "10.10.11.0"; } ]; "/ip dhcp-client" = [ { - comment = "defconf"; - "dhcp-options" = "hostname,clientid"; disabled = "no"; interface = "ether1"; } ]; - "/ip dhcp-server lease" = [ - { - address = "192.168.88.253"; - "allow-dual-stack-queue" = "no"; - "mac-address" = "D8:3A:DD:28:1D:3B"; - } - ]; "/ip dhcp-server network" = [ { - address = "192.168.88.0/24"; - comment = "defconf"; - gateway = "192.168.88.1"; + address = "10.10.10.0/24"; + gateway = "10.10.10.1"; + netmask = "24"; + } + { + address = "10.10.11.0/24"; + gateway = "10.10.11.1"; + netmask = "24"; } ]; "/ip dns" = { "allow-remote-requests" = "yes"; - servers = "192.168.88.253"; + servers = "1.1.1.1,1.0.0.1"; }; "/ip dns static" = [ {