nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 03:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Generate sshd_config to set XAuthLocation if X11 forwarding is

Browse Source 
enabled.

svn path=/nixos/trunk/; revision=7548
This commit is contained in:
Eelco Dolstra 2007-01-07 10:19:16 +00:00
parent 1a592f3a4e
commit b7f11ad98b
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/options.nix
View File

@ -271,7 +271,7 @@
{
name = ["services" "sshd" "forwardX11"];
default = false;
default = true;
description = "
Whether to enable sshd to forward X11 connections.
";

4
system/upstart.nix
View File

@ -85,7 +85,9 @@ import ../upstart-jobs/gather.nix {
# SSH daemon.
++ optional ["services" "sshd" "enable"]
(import ../upstart-jobs/sshd.nix {
inherit (pkgs) openssh glibc pwdutils;
inherit (pkgs) writeText openssh glibc pwdutils;
inherit (pkgs.xorg) xauth;
forwardX11 = config.get ["services" "sshd" "forwardX11"];
})
# NTP daemon.

18
upstart-jobs/sshd.nix
View File

@ -1,4 +1,18 @@
{openssh, glibc, pwdutils}:
{writeText, openssh, glibc, pwdutils, xauth, forwardX11}:
let
sshdConfig = writeText "sshd_config" "
UsePAM yes
${if forwardX11 then "
X11Forwarding yes
XAuthLocation ${xauth}/bin/xauth
" else "
X11Forwarding no
"}
";
in
{
name = "sshd";
@ -24,7 +38,7 @@ start script
fi
end script
respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${./sshd_config}
respawn ${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}
";
}

2
upstart-jobs/sshd_config
View File

@ -1,2 +0,0 @@
X11Forwarding yes
UsePAM yes