Unverified Commit 642317d0 authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #283618 from SuperSandro2000/tailscale-resoleconf 

nixos/tailscale: make resolvconf package depending on enablement of module
parents 32b67924 922351ec

nixos/modules/services/networking/tailscale.nix

+1 −2
Original line number Diff line number Diff line
@@ -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}"''