router: use public ipv4 on wan interface

hosts/router/firewall.nix

@@ -47,7 +47,15 @@ in
       map port_forward {
           type inet_proto . inet_service : ipv4_addr . inet_service
           elements = {
-              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006
+              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006,
+              # opnsense vpn endpoints
+              # the plan is to maybe eventually move these to nixos
+              udp . 18596 : ${vars.extra.opnsense.addr4} . 18596,
+              udp . 48512 : ${vars.extra.opnsense.addr4} . 48512,
+              udp . 40993 : ${vars.extra.opnsense.addr4} . 40993,
+              udp . 45608 : ${vars.extra.opnsense.addr4} . 45608,
+              udp . 35848 : ${vars.extra.opnsense.addr4} . 35848,
+              udp . 48425 : ${vars.extra.opnsense.addr4} . 48425,
           }
       }
 

hosts/router/private.nix

@@ -1,2 +1,3 @@
-U2FsdGVkX1/98w32OE1ppwT0I5A3UOTKCLJfvk+TQdrbf0TLfYNZ9TC9n8cH2hC9
+U2FsdGVkX1/MGwxIMmhbZuPqJUZzex9v5tTuiOrEvDVldI7xY0edUy9Ii5udFLXt
-ObKVuFlOLwHlzeBy7MXaLg==
+AbxShsH43FH1ucgygKDlKTB/yXZWDoDVhjdgLFjaBtAt0xyAL9Doet844oDVhbbO
+FqOwXHMd+PE23rgqiCscsA==

hosts/router/vars.nix

@@ -53,9 +53,9 @@ rec {
   ifs = rec {
     wan = rec {
       name = "wan";
-      addr4 = "192.168.1.61";
+      addr4 = private.wanAddr4;
-      addr4Sized = "${addr4}/24";
+      addr4Sized = "${addr4}/23";
-      gw4 = "192.168.1.254";
+      gw4 = private.wanGw4;
     };
     lan = mkIfConfig {
       name_ = "lan";