colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename services.sshd' to services.openssh'.

Browse Source 
svn path=/nixos/trunk/; revision=20574
This commit is contained in:
Ludovic Courtès 2010-03-11 17:02:49 +00:00
parent bcd3cd85f3
commit d1b4b7fd28
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/rename.nix
View File

@ -73,7 +73,13 @@ in zipModules ([]
++ rename obsolete "boot.initrd.extraKernelModules" to "boot.initrd.kernelModules" ++ rename obsolete "boot.initrd.extraKernelModules" to "boot.initrd.kernelModules"
# X11 # OpenSSH
++ rename obsolete "services.sshd.ports" to "services.openssh.ports"
++ rename obsolete "services.sshd.enable" to "services.openssh.enable"
++ rename obsolete "services.sshd.allowSFTP" to "services.openssh.allowSFTP"
++ rename obsolete "services.sshd.forwardX11" to "services.openssh.forwardX11"
++ rename obsolete "services.sshd.gatewayPorts" to "services.openssh.gatewayPorts"
++ rename obsolete "services.sshd.permitRootLogin" to "services.openssh.permitRootLogin"
++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent" ++ rename obsolete "services.xserver.startSSHAgent" to "services.xserver.startOpenSSHAgent"
# KDE # KDE

25
modules/services/networking/ssh/sshd.nix
View File

@ -4,9 +4,7 @@ with pkgs.lib;
let let
inherit (pkgs) openssh; cfg = config.services.openssh;
cfg = config.services.sshd;
nssModulesPath = config.system.nssModules.path; nssModulesPath = config.system.nssModules.path;
@ -27,7 +25,7 @@ let
"} "}
${if cfg.allowSFTP then " ${if cfg.allowSFTP then "
Subsystem sftp ${openssh}/libexec/sftp-server Subsystem sftp ${pkgs.openssh}/libexec/sftp-server
" else " " else "
"} "}
@ -49,13 +47,13 @@ in
options = { options = {
services.sshd = { services.openssh = {
enable = mkOption { enable = mkOption {
default = false; default = false;
description = '' description = ''
Whether to enable the Secure Shell daemon, which allows secure Whether to enable the OpenSSH secure shell daemon, which
remote logins. allows secure remote logins.
''; '';
}; };
@ -111,21 +109,21 @@ in
###### implementation ###### implementation
config = mkIf config.services.sshd.enable { config = mkIf config.services.openssh.enable {
users.extraUsers = singleton users.extraUsers = singleton
{ name = "sshd"; { name = "opensshd";
uid = config.ids.uids.sshd; uid = config.ids.uids.sshd;
description = "SSH privilege separation user"; description = "SSH privilege separation user";
home = "/var/empty"; home = "/var/empty";
}; };
environment.etc = singleton environment.etc = singleton
{ source = "${openssh}/etc/ssh/moduli"; { source = "${pkgs.openssh}/etc/ssh/moduli";
target = "ssh/moduli"; target = "ssh/moduli";
}; };
jobs.sshd = { jobs.openssh = {
description = "OpenSSH server"; description = "OpenSSH server";
@ -138,17 +136,16 @@ in
mkdir -m 0755 -p /etc/ssh mkdir -m 0755 -p /etc/ssh
if ! test -f /etc/ssh/ssh_host_dsa_key; then if ! test -f /etc/ssh/ssh_host_dsa_key; then
${openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N "" ${pkgs.openssh}/bin/ssh-keygen -t dsa -b 1024 -f /etc/ssh/ssh_host_dsa_key -N ""
fi fi
''; '';
daemonType = "fork"; daemonType = "fork";
exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}"; exec = "${pkgs.openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
}; };
networking.firewall.allowedTCPPorts = cfg.ports; networking.firewall.allowedTCPPorts = cfg.ports;
}; };
} }