diff options
Diffstat (limited to 'nixos/helpers.nix')
| -rw-r--r-- | nixos/helpers.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/nixos/helpers.nix b/nixos/helpers.nix index c6d1ff8..cadf230 100644 --- a/nixos/helpers.nix +++ b/nixos/helpers.nix @@ -1,8 +1,5 @@ -{ config, ... }: +{ config, lib, pkgs, ... }: -let - nixpkgs = import <nixpkgs> {}; -in { mkNginxConfig = name: '' access_log /var/log/nginx/${name}.access.log json; @@ -64,7 +61,7 @@ in ''; joinWgNamespace = ns: cfg: - nixpkgs.lib.attrsets.recursiveUpdate cfg { + lib.attrsets.recursiveUpdate cfg { bindsTo = ["netns@${ns}.service"]; after = ["wireguard-wg-${ns}.service"]; unitConfig.JoinsNamespaceOf = "netns@${ns}.service"; @@ -81,13 +78,9 @@ in TimeoutStopSec = 300; }; wantedBy = ["multi-user.target"]; - script = - let - pkgs = nixpkgs.pkgs; - in - '' - ${pkgs.iproute2}/bin/ip netns exec ${ns} ${pkgs.iproute2}/bin/ip link set dev lo up - ${pkgs.socat}/bin/socat tcp-listen:${toString port},fork,reuseaddr exec:'${pkgs.iproute2}/bin/ip netns exec ${ns} ${pkgs.socat}/bin/socat STDIO "tcp-connect:localhost:${toString port}"',nofork - ''; + script = '' + ${pkgs.iproute2}/bin/ip netns exec ${ns} ${pkgs.iproute2}/bin/ip link set dev lo up + ${pkgs.socat}/bin/socat tcp-listen:${toString port},fork,reuseaddr exec:'${pkgs.iproute2}/bin/ip netns exec ${ns} ${pkgs.socat}/bin/socat STDIO "tcp-connect:localhost:${toString port}"',nofork + ''; }; } |