diff --git a/config/ap.nix b/config/ap.nix index e004a63..8f095bb 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -1991,7 +1991,38 @@ }; }; }; - ap64 = { }; + ap64 = { + interfaces = { + mgmt = { + gw4 = "mgmt-gw"; + gw6 = "mgmt-gw"; + type = "phys"; + }; + priv46.type = "bridge"; + pub.type = "bridge"; + }; + links = { + priv46 = { + ports = [ "lan" ]; + }; + switch-b3 = { + ports = [ "wan" ]; + }; + }; + location = "B4.07"; + model = "tplink_tl-wr1043nd-v2"; + role = "ap"; + wifi = { + "platform/ahb/18100000.wmac" = { + channel = 1; + htmode = "HT40+"; + ssids = { + "ZW public" = { net = "pub"; }; + "Princess Castle" = { net = "priv46"; }; + }; + }; + }; + }; ap7 = { interfaces = { mgmt = { diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index 85bf95f..ad761ee 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,75 +1,76 @@ -----BEGIN PGP MESSAGE----- -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 -zRxN+SwDxWTuTSntaZWKfvBBcZcLTQ== -=vYNL +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 +Rmax/XN+U1apZtOMls8w9//dIId8 +=4rTB -----END PGP MESSAGE----- diff --git a/config/secrets.nix b/config/secrets.nix index d1fc3fc..edc33fa 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -62,6 +62,7 @@ ap60.password = "encrypted"; ap61.password = "encrypted"; ap63.password = "encrypted"; + ap64.password = "encrypted"; switch-a1.password = "encrypted"; switch-b1.password = "encrypted"; switch-b2.password = "encrypted"; @@ -265,6 +266,9 @@ "pci0000:00/0000:00:00.0".ssids."EckiTino".psk = "encrypted"; "platform/ahb/18100000.wmac".ssids."EckiTino legacy".psk = "encrypted"; }; + ap64.wifi = { + "platform/ahb/18100000.wmac".ssids."Princess Castle".psk = "encrypted"; + }; ap7.wifi."platform/qca953x_wmac".ssids."mino".psk = "encrypted"; ap8.wifi = { "pci0000:00/0000:00:00.0".ssids."C3D2".psk = "encrypted"; diff --git a/config/switch.nix b/config/switch.nix index 82e3eb4..8541d60 100644 --- a/config/switch.nix +++ b/config/switch.nix @@ -156,7 +156,7 @@ priv2.ports = [ "ge-1/0/4" ]; priv24.ports = [ "ge-0/0/6" "ge-1/0/16" ]; priv3.ports = [ "ge-1/0/5" ]; - priv46.ports = [ "ge-0/0/45" ]; + ap64.ports = [ "ge-0/0/45" ]; pub.ports = [ "ge-1/0/11" ]; diff --git a/contact.md.asc b/contact.md.asc index 6162c4c..19ddacd 100644 Binary files a/contact.md.asc and b/contact.md.asc differ