diff --git a/config/ap.nix b/config/ap.nix index 6e0c595..b8d97d1 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -2290,6 +2290,25 @@ }; }; }; + ap71 = { + interfaces = { + mgmt = { + gw4 = "mgmt-gw"; + gw6 = "mgmt-gw"; + type = "phys"; + }; + priv22.type = "bridge"; + pub.type = "bridge"; + }; + links = { + priv22.ports = [ "eth1" "eth2" ]; + ap40.ports = [ "eth0" ]; + }; + location = "B4.01 behind ap40"; + model = "ubnt_unifi-usg"; + role = "ap"; + # No WiFi, splits just VLANs + }; ap8 = { interfaces = { c3d2.type = "bridge"; diff --git a/config/net/mgmt.nix b/config/net/mgmt.nix index 8dc6bb9..8716f77 100644 --- a/config/net/mgmt.nix +++ b/config/net/mgmt.nix @@ -70,6 +70,7 @@ ap69 = "10.0.0.109"; ap7 = "10.0.0.47"; ap70 = "10.0.0.110"; + ap71 = "10.0.0.111"; ap8 = "10.0.0.48"; ap9 = "10.0.0.49"; logging = "10.0.0.251"; @@ -176,6 +177,7 @@ ap69 = "fd23:42:c3d2:580::4:45"; ap7 = "fd23:42:c3d2:580::4:7"; ap70 = "fd23:42:c3d2:580::4:46"; + ap71 = "fd23:42:c3d2:580::4:47"; ap8 = "fd23:42:c3d2:580::4:8"; ap9 = "fd23:42:c3d2:580::4:9"; mgmt-gw = "fd23:42:c3d2:580:ffff:ffff:ffff:ffff"; diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index feaf443..77d191b 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,84 +1,84 @@ -----BEGIN PGP MESSAGE----- -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 -RJil -=uE+B +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 +a09mSLYUHW6OhUmSQX1MdjZT9Q== +=gKeK -----END PGP MESSAGE----- diff --git a/config/secrets.nix b/config/secrets.nix index 4bfb4f7..b1c7c1d 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -71,6 +71,7 @@ ap68.password = "encrypted"; ap69.password = "encrypted"; ap70.password = "encrypted"; + ap71.password = "encrypted"; switch-a1.password = "encrypted"; switch-b1.password = "encrypted"; switch-b2.password = "encrypted"; diff --git a/contact.md.asc b/contact.md.asc index 372ea50..c0c58cf 100644 Binary files a/contact.md.asc and b/contact.md.asc differ diff --git a/nix/pkgs/openwrt/uci-config.nix b/nix/pkgs/openwrt/uci-config.nix index 155d531..1c18964 100644 --- a/nix/pkgs/openwrt/uci-config.nix +++ b/nix/pkgs/openwrt/uci-config.nix @@ -18,18 +18,21 @@ let # ours don't come with a switch. then false else + openwrtModel ? ports + && any ({ switch ? null, ... }: switch != null) (builtins.attrValues openwrtModel.ports); - hasDSA = + hasDSA = ( all ({ switch ? null, ... }: switch == null - ) (builtins.attrValues openwrtModel.ports) + ) (builtins.attrValues openwrtModel.ports or {}) && any ({ port ? null, interface ? null, ... }: port != null && interface != null && port == interface - ) (builtins.attrValues openwrtModel.ports); + ) (builtins.attrValues openwrtModel.ports or {}) + ) || hostConfig.model == "ubnt_unifi-usg"; portsDoc = let