pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #283618 from SuperSandro2000/tailscale-resoleconf

nixos/tailscale: make resolvconf package depending on enablement of module

authored by maxine and committed by GitHub 642317d0 32b67924

+1 -2
unified split
+1 -2
nixos/modules/services/networking/tailscale.nix
··· 74 systemd.services.tailscaled = { 75 wantedBy = [ "multi-user.target" ]; 76 path = [ 77 - config.networking.resolvconf.package # for configuring DNS in some configs 78 pkgs.procps # for collecting running services (opt-in feature) 79 pkgs.getent # for `getent` to look up user shells 80 pkgs.kmod # required to pass tailscale's v6nat check 81 - ]; 82 serviceConfig.Environment = [ 83 "PORT=${toString cfg.port}" 84 ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"''
··· 74 systemd.services.tailscaled = { 75 wantedBy = [ "multi-user.target" ]; 76 path = [ 77 pkgs.procps # for collecting running services (opt-in feature) 78 pkgs.getent # for `getent` to look up user shells 79 pkgs.kmod # required to pass tailscale's v6nat check 80 + ] ++ lib.optional config.networking.resolvconf.enable config.networking.resolvconf.package; 81 serviceConfig.Environment = [ 82 "PORT=${toString cfg.port}" 83 ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"''