summary refs log tree commit diff
path: root/nixos/modules/services/networking
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 15:38:42 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 15:38:42 +0200
commitf3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b (patch)
tree3acc20e0aa7bc5a475fa0a005b82fd180d2fc0ec /nixos/modules/services/networking
parente8315cb1caac6343322b5bab822f3cd227ae287b (diff)
downloadnixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar.gz
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar.bz2
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar.lz
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar.xz
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.tar.zst
nixlib-f3c32cb2c1344c9a831bb9e4f47c1b20527dbe0b.zip
Let services.openssh.forwardX11 imply programs.ssh.setXAuthLocation
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index f900ef494abf..ef186a20f932 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -227,6 +227,8 @@ in
 
   config = mkIf cfg.enable {
 
+    programs.ssh.setXAuthLocation = mkForce cfg.forwardX11;
+
     users.extraUsers.sshd =
       { isSystemUser = true;
         description = "SSH privilege separation user";