Compare commits
8 Commits
home/refac
...
19a7fbf181
| Author | SHA1 | Date | |
|---|---|---|---|
|
19a7fbf181
|
|||
|
2ca40aa2f9
|
|||
|
9c02c5b611
|
|||
|
77df850248
|
|||
|
beaf8ae2bd
|
|||
|
e8f37f3245
|
|||
|
2ba1412280
|
|||
|
1b7395c392
|
5
.gitignore
vendored
5
.gitignore
vendored
@@ -0,0 +1,5 @@
|
|||||||
|
### Nix template
|
||||||
|
# Ignore build outputs from performing a nix-build or `nix build` command
|
||||||
|
result
|
||||||
|
result-*
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ in
|
|||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./ifconfig.nix
|
./ifconfig.nix
|
||||||
|
./wireguard.nix
|
||||||
./firewall.nix
|
./firewall.nix
|
||||||
./dns.nix
|
./dns.nix
|
||||||
./kea.nix
|
./kea.nix
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ let
|
|||||||
${ifs.lan30.name},
|
${ifs.lan30.name},
|
||||||
${ifs.lan40.name},
|
${ifs.lan40.name},
|
||||||
${ifs.lan50.name},
|
${ifs.lan50.name},
|
||||||
|
wg0,
|
||||||
}
|
}
|
||||||
define OPNSENSE_NET6 = ${vars.extra.opnsense.net6}
|
define OPNSENSE_NET6 = ${vars.extra.opnsense.net6}
|
||||||
define ZONE_LAN_EXTRA_NET6 = {
|
define ZONE_LAN_EXTRA_NET6 = {
|
||||||
@@ -85,8 +86,10 @@ in
|
|||||||
family = "inet";
|
family = "inet";
|
||||||
content = ''
|
content = ''
|
||||||
${nftIdentifiers}
|
${nftIdentifiers}
|
||||||
define ALLOWED_TCP_PORTS = { ssh, https }
|
define ALLOWED_TCP_PORTS = { ssh }
|
||||||
define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain, https }
|
define ALLOWED_UDP_PORTS = { 18596 }
|
||||||
|
define ALLOWED_TCP_LAN_PORTS = { ssh, https }
|
||||||
|
define ALLOWED_UDP_LAN_PORTS = { bootps, dhcpv6-server, domain, https }
|
||||||
set port_forward_v6 {
|
set port_forward_v6 {
|
||||||
type inet_proto . ipv6_addr . inet_service
|
type inet_proto . ipv6_addr . inet_service
|
||||||
elements = {
|
elements = {
|
||||||
@@ -133,6 +136,10 @@ in
|
|||||||
# but apparently not.
|
# but apparently not.
|
||||||
ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
|
ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
|
||||||
|
|
||||||
|
# Global input rules
|
||||||
|
tcp dport $ALLOWED_TCP_PORTS accept
|
||||||
|
udp dport $ALLOWED_UDP_PORTS accept
|
||||||
|
|
||||||
# WAN zone input rules
|
# WAN zone input rules
|
||||||
iifname $ZONE_WAN_IFS jump zone_wan_input
|
iifname $ZONE_WAN_IFS jump zone_wan_input
|
||||||
# LAN zone input rules
|
# LAN zone input rules
|
||||||
@@ -157,8 +164,7 @@ in
|
|||||||
}
|
}
|
||||||
|
|
||||||
chain zone_wan_input {
|
chain zone_wan_input {
|
||||||
# Allow SSH from WAN (if needed)
|
# Allow specific stuff from WAN
|
||||||
tcp dport ssh accept
|
|
||||||
}
|
}
|
||||||
|
|
||||||
chain zone_wan_forward {
|
chain zone_wan_forward {
|
||||||
@@ -180,8 +186,8 @@ in
|
|||||||
ip protocol icmp accept
|
ip protocol icmp accept
|
||||||
|
|
||||||
# Allow specific services from LAN
|
# Allow specific services from LAN
|
||||||
tcp dport $ALLOWED_TCP_PORTS accept
|
tcp dport $ALLOWED_TCP_LAN_PORTS accept
|
||||||
udp dport $ALLOWED_UDP_PORTS accept
|
udp dport $ALLOWED_UDP_LAN_PORTS accept
|
||||||
}
|
}
|
||||||
|
|
||||||
chain zone_lan_forward {
|
chain zone_lan_forward {
|
||||||
|
|||||||
5
hosts/router/secrets/wireguard/wg0-peer-AsusS513-psk.age
Normal file
5
hosts/router/secrets/wireguard/wg0-peer-AsusS513-psk.age
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 D2MY/A YAk0egMScFdPo0uAZzITtgQyPAifDcVUfb957Zhz9Ec
|
||||||
|
pAEM+7sbPE8rHBhRV7mTmH1w4mbfKFopMWbwu/3KHCw
|
||||||
|
--- ykshsqEqKvCCE2kWIPAJPA/DFW7mu6+0x4MQhHgi1yU
|
||||||
|
'<27>zƀ{g<>id\{<7B>E<EFBFBD><45><EFBFBD>tp<74>U<>g2QC3g<33><08>JG<4A>V1<56>6<>WG_E&<26>v<EFBFBD><76>)<29>&<26><><EFBFBD>ޑN"<22><><EFBFBD>n<EFBFBD>_T͒<54>
|
||||||
BIN
hosts/router/secrets/wireguard/wg0-peer-Yura-Pixel7Pro-psk.age
Normal file
BIN
hosts/router/secrets/wireguard/wg0-peer-Yura-Pixel7Pro-psk.age
Normal file
Binary file not shown.
@@ -0,0 +1,6 @@
|
|||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 D2MY/A P88M0uj4ZphVo3WrRYDu+c7B0Dl7ncctbYkByYmU2wg
|
||||||
|
DV3Gn6TQ6iByAlNt0gg8kSZ2r0Gie/wcznZx9M+CC2g
|
||||||
|
--- KhwGM50BVql02Jq0do2uhXMfgWPPDfbodzDRmZ9n0O4
|
||||||
|
r<EFBFBD><EFBFBD><EFBFBD>Զa<EFBFBD>yY/C<><43>J<EFBFBD>B<EFBFBD>X<EFBFBD>!<21>"F
|
||||||
|
<EFBFBD>h<EFBFBD><EFBFBD><EFBFBD>(<28>L><3E>()<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>S;<3B>}}2ОO.<2E><13>hoqY<19>K"c<>E<EFBFBD><45>JM?-<2D>O
|
||||||
5
hosts/router/secrets/wireguard/wg0-private-key.age
Normal file
5
hosts/router/secrets/wireguard/wg0-private-key.age
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 D2MY/A tvRtTGWnaB0zxqZRba4/XpzwPa61RrnHCk4tT8OfnGQ
|
||||||
|
IX85Q5VKxQTl+MnhzwiuTnNMVkR9QrYo/1njrbZeBnQ
|
||||||
|
--- dmlPIL2T+RFhbO2iLDRa4BxxYSSUQdedV3TK83ooFdA
|
||||||
|
<18>gE 7<><37>0`d<>V(o<>W<EFBFBD><57><EFBFBD>S@<01>ۭ<EFBFBD><DBAD><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD><5A>ЃT<D083><54><EFBFBD><EFBFBD><14>U<EFBFBD><55>+*<2A>\Q<><51>[<5B><><EFBFBD><EFBFBD>x<><78>29<32>i5<69>k
|
||||||
@@ -52,7 +52,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
secrix.system.secrets.cf-api-key.encrypted.file = ../../secrets/cf_api_key.age;
|
secrix.system.secrets.cf-api-key.encrypted.file = ./secrets/cf-api-key.age;
|
||||||
systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrix.system.secrets.cf-api-key.decrypted.path;
|
systemd.services.caddy.serviceConfig.EnvironmentFile = config.secrix.system.secrets.cf-api-key.decrypted.path;
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -99,6 +99,17 @@ rec {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wg = {
|
||||||
|
wg0 = rec {
|
||||||
|
name = "wg0";
|
||||||
|
p4 = "10.18.16"; # .0/24
|
||||||
|
addr4 = "${p4}.1";
|
||||||
|
addr4Sized = "${addr4}/24";
|
||||||
|
p6 = "${pdFromWan}f::6"; # :0:0/96
|
||||||
|
addr6 = "${p6}:0:1";
|
||||||
|
addr6Sized = "${addr6}/96";
|
||||||
|
};
|
||||||
|
|
||||||
extra = {
|
extra = {
|
||||||
opnsense = rec {
|
opnsense = rec {
|
||||||
addr4 = "${ifs.lan.p4}.250";
|
addr4 = "${ifs.lan.p4}.250";
|
||||||
|
|||||||
67
hosts/router/wireguard.nix
Normal file
67
hosts/router/wireguard.nix
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
let
|
||||||
|
vars = import ./vars.nix;
|
||||||
|
wg0 = vars.wg.wg0;
|
||||||
|
|
||||||
|
wg0Peers = {
|
||||||
|
"Yura-TPX13" = {
|
||||||
|
allowedIPs = [ "${wg0.p4}.3/32" "${wg0.p6}:3:0/112" ];
|
||||||
|
publicKey = "iJa5JmJbMHNlbEluNwoB2Q8LyrPAfb7S/mluanMcI08=";
|
||||||
|
pskEnabled = true;
|
||||||
|
};
|
||||||
|
"Yura-Pixel7Pro" = {
|
||||||
|
allowedIPs = [ "${wg0.p4}.4/32" "${wg0.p6}:4:0/112" ];
|
||||||
|
publicKey = "UjZlsukmAsX60Z5FnZwKCSu141Gjj74+hBVT3TRhwT4=";
|
||||||
|
pskEnabled = true;
|
||||||
|
};
|
||||||
|
"AsusS513" = {
|
||||||
|
allowedIPs = [ "${wg0.p4}.100/32" ];
|
||||||
|
publicKey = "XozJ7dHdJfkLORkCVxaB1VmvHEOAA285kRZcmzfPl38=";
|
||||||
|
pskEnabled = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
peerSecretName = name: "wg0-peer-${name}-psk";
|
||||||
|
secrets = config.secrix.services.systemd-networkd.secrets;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
secrix.services.systemd-networkd.secrets = let
|
||||||
|
pskPeers = lib.attrsets.filterAttrs (name: peer: peer.pskEnabled) wg0Peers;
|
||||||
|
mapPeer = name: peer: {
|
||||||
|
name = peerSecretName name;
|
||||||
|
value.encrypted.file = ./secrets/wireguard/${peerSecretName name}.age;
|
||||||
|
};
|
||||||
|
peerSecrets = lib.attrsets.mapAttrs' mapPeer pskPeers;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
wg0-private-key.encrypted.file = ./secrets/wireguard/wg0-private-key.age;
|
||||||
|
} // peerSecrets;
|
||||||
|
|
||||||
|
systemd.network.netdevs = {
|
||||||
|
"10-wg0" = {
|
||||||
|
netdevConfig = {
|
||||||
|
Kind = "wireguard";
|
||||||
|
Name = "wg0";
|
||||||
|
};
|
||||||
|
wireguardConfig = {
|
||||||
|
PrivateKeyFile = secrets.wg0-private-key.decrypted.path;
|
||||||
|
ListenPort = 18596;
|
||||||
|
};
|
||||||
|
wireguardPeers = map (peer: {
|
||||||
|
AllowedIPs = lib.strings.concatStringsSep "," peer.value.allowedIPs;
|
||||||
|
PublicKey = peer.value.publicKey;
|
||||||
|
PresharedKeyFile = if peer.value.pskEnabled then secrets."${peerSecretName peer.name}".decrypted.path else null;
|
||||||
|
}) (lib.attrsToList wg0Peers);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.network.networks = {
|
||||||
|
"10-wg0" = {
|
||||||
|
matchConfig.Name = "wg0";
|
||||||
|
networkConfig = {
|
||||||
|
IPv4Forwarding = true;
|
||||||
|
IPv6SendRA = false;
|
||||||
|
Address = [ wg0.addr4Sized wg0.addr6Sized ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user