diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-01-22 18:22:52 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-01-25 15:50:36 +0100 |
| commit | 922351ec866dcfe1dca4d190bfd3c360933e5cd0 (patch) | |
| tree | 506cba3e1abc628d82d9e42732a80b264469cb94 /nixos | |
| parent | 5e05ea57fbdacda46941b6c87558e99e0d933093 (diff) | |
| download | nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar.gz nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar.bz2 nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar.lz nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar.xz nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.tar.zst nixlib-922351ec866dcfe1dca4d190bfd3c360933e5cd0.zip | |
nixos/tailscale: make resolvconf package depending on enablement of module
If resolvconf is not enabled, trying to use it always fails because /etc/resolvconf.conf contains an `exit 1`.
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}"'' |