schulze/nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: schulze:d27def912ce1fb9f41d1701c39fceaa2df63f5ca
Branches Tags
schulze:master
...
compare: schulze:529c409985f859f494b7473aa113a6b8341dd2a8
Branches Tags
schulze:master

2 Commits
d27def912c ... 529c409985

Author SHA1 Message Date
Felix Schulze
529c409985 simpler ssh config 2025-06-26 11:21:38 +02:00
Felix Schulze
e33f18e990 VPN updates 
vpn interface names

vpn config fix
 2025-06-26 11:21:38 +02:00
3 changed files with 80 additions and 8 deletions
Expand all files Collapse all files

41
hosts/hurricane/vpn.nix
View File

@@ -1,6 +1,6 @@
{
networking.wg-quick.interfaces = {
wg-hurricane = {
wg-felix = {
address = ["10.8.0.4/24"];
dns = ["192.168.0.128"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Felix-Hurricane-pk";
@@ -15,5 +15,44 @@
}
];
};
wg-csb = {
address = ["192.168.108.17/22" "2a02:9a0:102:108::17/64"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/CSB-Hurricane-pk";
peers = [
{
publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ=";
allowedIPs = ["172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"];
endpoint = "prod-net-vpn1.infra.brainmill.com:51819";
persistentKeepalive = 25;
}
];
};
wg-fg = {
address = ["10.255.11.11/24" "2a02:9a0:300:fff0:11::11/64"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/FG-Hurricane-pk";
peers = [
{
publicKey = "h/BUyzXy0Xo4KJKS/U5V4C9rDJT3fWjjiZoy0I7P+H4=";
allowedIPs = ["10.0.0.0/8" "192.168.10.0/24" "2a02:9a0:300:fff0::/48"];
endpoint = "gw1.net.chsfg.se:51831";
persistentKeepalive = 25;
}
];
};
wg-neanet = {
address = ["192.168.108.25/32" "2a09:2681:204:1::27/64"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Neanet-Hurricane-pk";
peers = [
{
publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM=";
allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"];
endpoint = "prod-jump-got1.infra.brainmill.com:51820";
persistentKeepalive = 25;
}
];
};
};
}

42
hosts/wildfire/vpn.nix
View File

@@ -1,10 +1,9 @@
{
networking.wg-quick.interfaces = {
wg-wildfire = {
wg-felix = {
address = ["10.8.0.5/24"];
dns = ["192.168.0.128"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Felix-Wildfire-pk";
peers = [
{
publicKey = "a35ZSWhBNzPFkf1RCkg4E7cNnUdGGOr4CsA0EM65H0g=";
@@ -15,5 +14,44 @@
}
];
};
wg-csb = {
address = ["192.168.108.27/22" "2a02:9a0:102:108::b/64"];
privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/CSB-Wildfire-pk";
peers = [
{
publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ=";
allowedIPs = ["172.18.0.0/16" "192.168.3.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"];
endpoint = "prod-net-vpn1.infra.brainmill.com:51819";
persistentKeepalive = 25;
}
];
};
# wg-fg = {
# address = ["10.255.11.11/24" "2a02:9a0:300:fff0:11::11/64"];
# privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/FG-Wildfire-pk";
# peers = [
# {
# publicKey = "h/BUyzXy0Xo4KJKS/U5V4C9rDJT3fWjjiZoy0I7P+H4=";
# allowedIPs = ["10.0.0.0/8" "192.168.10.0/24" "2a02:9a0:300:fff0::/48"];
# endpoint = "gw1.net.chsfg.se:51831";
# persistentKeepalive = 25;
# }
# ];
# };
#
# wg-neanet = {
# address = ["192.168.108.25/32" "2a09:2681:204:1::27/64"];
# privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Neanet-Wildfire-pk";
# peers = [
# {
# publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM=";
# allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"];
# endpoint = "prod-jump-got1.infra.brainmill.com:51820";
# persistentKeepalive = 25;
# }
# ];
# };
};
}

5
modules/hm/ssh.nix
View File

@@ -7,23 +7,18 @@
matchBlocks = {
"d10.csb.brainmill.com" = {
forwardAgent = true;
port = 22;
};
"prod-admin-jump1.infra.csbnet.se" = {
forwardAgent = true;
port = 22;
};
"prod-jump-got1.infra.brainmill.com" = {
forwardAgent = true;
port = 22;
};
"gw1.net.chsfg.se" = {
forwardAgent = true;
hostname = "2a02:9a0:fffe:4::3";
};
"gw2.net.chsfg.se" = {
forwardAgent = true;
hostname = "2a02:9a0:fffe:4::5";
};
"cv11-stor-gw.net.chsfg.se" = {
proxyCommand = "ssh prod-admin-jump1.infra.csbnet.se /bin/nc %h 22";