1
0

Compare commits

...

3 Commits

5 changed files with 182 additions and 45 deletions

@ -19,14 +19,13 @@
";
networking.useDHCP = false;
systemd.network.enable = true;
#services.wg-clerie = {
# enable = true;
# ipv6s = [ "2a01:4f8:c0c:15f1::8108/128" ];
# ipv4s = [ "10.20.30.108/32" ];
#};
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8108/128" ];
ipv4s = [ "10.20.30.108/32" ];
};
clerie.monitoring = {
enable = true;

@ -25,40 +25,12 @@
networking.firewall.enable = false;
#networking.iproute2.enable = true;
#networking.iproute2.rttablesExtraConfig = ''
# 200 wg-clerie
#'';
#petabyte.policyrouting = {
# enable = true;
# rules6 = [
# { rule = "from 2a01:4f8:c0c:15f1::8107/128 lookup wg-clerie"; prio = 20000; }
# { rule = "from 2a01:4f8:c0c:15f1::8107/128 unreachable"; prio = 20001; }
# ];
# rules4 = [
# { rule = "from 10.20.30.107/32 lookup wg-clerie"; prio = 20000; }
# { rule = "from 10.20.30.107/32 unreachable"; prio = 20001; }
# ];
#};
#networking.wireguard.enable = true;
#networking.wireguard.interfaces = {
# wg-clerie = {
# ips = [ "2a01:4f8:c0c:15f1::8107/128" "10.20.30.107/32" ];
# table = "wg-clerie";
# peers = [
# {
# endpoint = "vpn.clerie.de:51820";
# persistentKeepalive = 25;
# allowedIPs = [ "0.0.0.0/0" "::/0" "10.20.30.0/24" "2a01:4f8:c0c:15f1::/113" ];
# publicKey = "2p1Jqs3bkXbXHFWE6vp1yxHIFoUaZQEARS2nJzbkuBA=";
# }
# ];
# privateKeyFile = "/var/src/secrets/wireguard/wg-clerie";
# };
#};
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8107/128" ];
ipv4s = [ "10.20.30.107/32" ];
privateKeyFile = "/var/src/secrets/wireguard/wg-clerie";
};
clerie.monitoring = {
enable = true;

@ -23,11 +23,11 @@
networking.hostName = "tungsten";
#services.wg-clerie = {
# enable = true;
# ipv6s = [ "2a01:4f8:c0c:15f1::8112/128" ];
# ipv4s = [ "10.20.30.112/32" ];
#};
profiles.clerie.wg-clerie = {
enable = true;
ipv6s = [ "2a01:4f8:c0c:15f1::8112/128" ];
ipv4s = [ "10.20.30.112/32" ];
};
clerie.monitoring = {
enable = true;

@ -9,6 +9,7 @@
./mercury-vm
./netcup
./network-fallback-dhcp
./wg-clerie
];
}

@ -0,0 +1,165 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.profiles.clerie.wg-clerie;
in
{
options = {
profiles.clerie.wg-clerie = {
enable = mkEnableOption "VPN for public static IP";
privateKeyFile = mkOption {
type = with types; nullOr str;
default = null;
description = "Path to file containing private key for wireguard interface";
};
ipv6s = mkOption {
type = with types; listOf str;
default = [];
description = "IPv6 interface addresses";
};
ipv4s = mkOption {
type = with types; listOf str;
default = [];
description = "IPv4 interface addresses";
};
defaultViaVPN = mkOption {
type = types.bool;
default = true;
description = "Use VPN default route for a protocol, if that protocol is unavailable in the underlay";
};
};
};
config = mkIf cfg.enable {
systemd.network.config.routeTables = {
wg-clerie = 200;
};
systemd.network.config.addRouteTablesToIPRoute2 = true;
sops = (mkIf (cfg.privateKeyFile == null) {
secrets.wg-clerie = {
owner = "systemd-network";
group = "systemd-network";
};
});
systemd.network.netdevs."10-wg-clerie" = {
netdevConfig = {
Kind = "wireguard";
Name = "wg-clerie";
};
wireguardConfig = {
PrivateKeyFile = if cfg.privateKeyFile != null then cfg.privateKeyFile else
config.sops.secrets.wg-clerie.path;
RouteTable = "wg-clerie";
};
wireguardPeers = [
{
PublicKey = "2p1Jqs3bkXbXHFWE6vp1yxHIFoUaZQEARS2nJzbkuBA=";
AllowedIPs = [ "0.0.0.0/0" "::/0" "10.20.30.0/24" "2a01:4f8:c0c:15f1::/113" ];
Endpoint = "78.47.183.82:51820";
PersistentKeepalive = 25;
}
];
};
systemd.network.networks."10-wg-clerie" = {
matchConfig.Name = "wg-clerie";
address = cfg.ipv6s ++ cfg.ipv4s;
routingPolicyRules = (builtins.map
(ip: {
Priority = 19000;
Family = "ipv6";
From = ip;
#Type = "table";
Table = "wg-clerie";
})
cfg.ipv6s
) ++ (builtins.map
(ip: {
Priority = 19001;
Family = "ipv6";
From = ip;
Type = "unreachable";
})
cfg.ipv6s
) ++ (builtins.map
(ip: {
Priority = 19000;
Family = "ipv4";
From = ip;
#Type = "table";
Table = "wg-clerie";
})
cfg.ipv4s
) ++ (builtins.map
(ip: {
Priority = 19001;
Family = "ipv4";
From = ip;
Type = "unreachable";
})
cfg.ipv4s
) ++ [
{
Priority = 20000;
Family = "ipv6";
To = "2a01:4f8:c0c:15f1::1/128";
IPProtocol = "udp";
DestinationPort = 51820;
#Type = "table";
Table = "main";
}
{
Priority = 20001;
Family = "ipv6";
To = "2a01:4f8:c0c:15f1::1/128";
IPProtocol = "udp";
DestinationPort = 51820;
Type = "unreachable";
}
{
Priority = 20000;
Family = "ipv4";
To = "78.47.183.82/32";
IPProtocol = "udp";
DestinationPort = 51820;
#Type = "table";
Table = "main";
}
{
Priority = 20001;
Family = "ipv4";
To = "78.47.183.82/32";
IPProtocol = "udp";
DestinationPort = 51820;
Type = "unreachable";
}
{
Priority = 21000;
Family = "both";
#Type = "table";
Table = "main";
}
] ++ (if cfg.defaultViaVPN then [
{
Priority = 21001;
Family = "both";
#Type = "table";
Table = "wg-clerie";
}
] else []) ++ [
{
Priority = 22000;
Family = "both";
Type = "unreachable";
}
];
};
};
}