dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

ninurta: Fix tunnels

Browse source
This commit is contained in:
Tim Schubert 2023-06-18 12:38:12 +02:00
parent d70b976f87
commit 2f032a07f9
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
nixos/ninurta/configuration.nix
View file

@ -48,7 +48,6 @@ in
hostKeys = [ initrdSshKey ]; hostKeys = [ initrdSshKey ];
}; };
}; };
# Kinda does not work?
systemd = { systemd = {
enable = true; enable = true;
network = { network = {
@ -126,7 +125,7 @@ in
}; };
services.hydra = { services.hydra = {
enable = true; enable = false;
package = pkgs.hydra-unstable; package = pkgs.hydra-unstable;
hydraURL = "https://hydra.dadada.li"; hydraURL = "https://hydra.dadada.li";
notificationSender = "hydra@localhost"; notificationSender = "hydra@localhost";
@ -182,11 +181,21 @@ in
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /var/www/pruflas.uwu 0551 nginx nginx - -" "d /var/www/pruflas.uwu 0551 nginx nginx - -"
"d /mnt/storage/backups/ninurta 0750 ${config.users.users.borg.name} ${config.users.users.borg.group} - -"
]; ];
age.secrets.${wg0PrivKey}.file = "${secretsPath}/${wg0PrivKey}.age"; age.secrets.${wg0PrivKey} = {
age.secrets.${wg0PresharedKey}.file = "${secretsPath}/${wg0PresharedKey}.age"; file = "${secretsPath}/${wg0PrivKey}.age";
age.secrets.${wgHydraPrivKey}.file = "${secretsPath}/${wgHydraPrivKey}.age"; owner = "systemd-network";
};
age.secrets.${wg0PresharedKey} = {
file = "${secretsPath}/${wg0PresharedKey}.age";
owner = "systemd-network";
};
age.secrets.${wgHydraPrivKey} = {
file = "${secretsPath}/${wgHydraPrivKey}.age";
owner = "systemd-network";
};
# This does not work, since the key is needed earlier than run-agenix.mount. # This does not work, since the key is needed earlier than run-agenix.mount.
# age.secrets.${initrdSshKey} = { # age.secrets.${initrdSshKey} = {
@ -243,12 +252,12 @@ in
}; };
"10-hydra" = { "10-hydra" = {
matchConfig.Name = "hydra"; matchConfig.Name = "hydra";
address = [ "10.3.3.1/24" ]; address = [ "10.3.3.3/24" ];
DHCP = "no"; DHCP = "no";
networkConfig.IPv6AcceptRA = false; networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = false;
routes = [ routes = [
{ routeConfig = { Gateway = "10.3.3.3"; Destination = "10.3.3.3/32"; }; } { routeConfig = { Gateway = "10.3.3.1"; Destination = "10.3.3.3/32"; }; }
]; ];
}; };
"10-uwu" = { "10-uwu" = {
@ -258,7 +267,7 @@ in
domains = [ "uwu" ]; domains = [ "uwu" ];
DHCP = "no"; DHCP = "no";
networkConfig.IPv6AcceptRA = false; networkConfig.IPv6AcceptRA = false;
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = false;
routes = [ routes = [
{ routeConfig = { Destination = "10.11.0.0/22"; }; } { routeConfig = { Destination = "10.11.0.0/22"; }; }
{ routeConfig = { Destination = "fc00:1337:dead:beef::10.11.0.0/118"; }; } { routeConfig = { Destination = "fc00:1337:dead:beef::10.11.0.0/118"; }; }