xyno/nix-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aaaa

Browse source
This commit is contained in:
Lucy Hochkamp 2024-04-02 16:15:31 +02:00
parent aed461750e
commit 626cf8adba
No known key found for this signature in database
2 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/picard/ts-ovpn.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, options, ... }: { { config, pkgs, options, ... }: {
imports = [ imports = [
../../nixos-modules/services/tailscale-openvpn.nix ../../nixos-modules/services/tailscale-openvpn.nix
../../nixos-modules/system/agenix.nix ../../nixos-modules/system/agenix.nix
]; ];
ragon = { ragon = {
agenix.secrets."ovpnNl" = { }; agenix.secrets."ovpnNl" = { };
@ -12,13 +12,13 @@
agenix.secrets."ovpnPw2" = { }; agenix.secrets."ovpnPw2" = { };
agenix.secrets."tailscaleKey" = { }; agenix.secrets."tailscaleKey" = { };
services.tailscale-openvpn = { services.tailscale-openvpn = {
enable = true; enable = true;
tsAuthKey = config.age.secrets.tailscaleKey.path; tsAuthKey = config.age.secrets.tailscaleKey.path;
config = { config = {
nl = config.age.secrets.ovpnNl.path; nl = config.age.secrets.ovpnNl.path;
de = config.age.secrets.ovpnDe.path; de = config.age.secrets.ovpnDe.path;
tu = config.age.secrets.ovpnTu.path; tu = config.age.secrets.ovpnTu.path;
};
}; };
};
}; };
} }

12
nixos-modules/services/tailscale-openvpn.nix
View file

@ -36,10 +36,9 @@ with lib;
(server: _: nameValuePair ("container@${container server}") ({ requires = [ "network-addresses-${bridgeExt}.service" ]; })) (server: _: nameValuePair ("container@${container server}") ({ requires = [ "network-addresses-${bridgeExt}.service" ]; }))
cfg.config cfg.config
); );
containers = imap0 containers = builtins.listToAttrs (imap0
(i: name: { (i: name: nameValuePair name
name = name; {
value = {
autoStart = true; autoStart = true;
ephemeral = true; ephemeral = true;
enableTun = true; enableTun = true;
@ -67,9 +66,8 @@ with lib;
}; };
}; };
}; })
}) (builtins.attrNames cfg.config));
(builtins.attrNames cfg.config);