diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2024-01-26 22:41:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-26 22:41:14 +0100 |
| commit | 642317d03f6803e170b2118bcc490c3b9a4050e5 (patch) | |
| tree | 003d843ee751e98a2986d4a83b2982c328f6fca9 /nixos | |
| parent | 32b679249841dd1271292e124ee86f2a6a4feb73 (diff) | |
| parent | 922351ec866dcfe1dca4d190bfd3c360933e5cd0 (diff) | |
| download | nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar.gz nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar.bz2 nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar.lz nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar.xz nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.tar.zst nixlib-642317d03f6803e170b2118bcc490c3b9a4050e5.zip | |
Merge pull request #283618 from SuperSandro2000/tailscale-resoleconf
nixos/tailscale: make resolvconf package depending on enablement of module
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/tailscale.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 1070e4e25296..f11fe57d6ce5 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -74,11 +74,10 @@ in { systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; path = [ - config.networking.resolvconf.package # for configuring DNS in some configs pkgs.procps # for collecting running services (opt-in feature) pkgs.getent # for `getent` to look up user shells pkgs.kmod # required to pass tailscale's v6nat check - ]; + ] ++ lib.optional config.networking.resolvconf.enable config.networking.resolvconf.package; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' |