diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-01 00:01:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 00:01:35 +0000 |
| commit | 7350c52b9b45cb395612d4404080129651d5ae45 (patch) | |
| tree | 772b324f635a59c770a587117648a69804a0eac9 /nixos/modules/services/networking | |
| parent | 1a1f2ce95d050f0a27674119d1d3346a57af06fb (diff) | |
| parent | 0293e3e473477f261aaef4a4f87c2deb36763570 (diff) | |
| download | nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar.gz nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar.bz2 nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar.lz nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar.xz nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.tar.zst nixpkgs-7350c52b9b45cb395612d4404080129651d5ae45.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/tailscale.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 91caa2ccb42..2c96b94ca43 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -453,6 +453,7 @@ in { ExecStart = (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + + "-D " + # don't detach into a daemon process "-f /etc/ssh/sshd_config"; KillMode = "process"; } // (if cfg.startWhenNeeded then { diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index c33a38179ee..3f88ff53dff 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -34,7 +34,7 @@ in { systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openresolv ]; + path = [ pkgs.openresolv pkgs.procps ]; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' |