Update users of `services.sshd'.
svn path=/nixos/trunk/; revision=20575
This commit is contained in:
parent
d1b4b7fd28
commit
8e16742b79
|
@ -112,7 +112,7 @@ let
|
|||
|
||||
# Add your own options below and run "nixos-rebuild switch".
|
||||
# E.g.,
|
||||
# services.sshd.enable = true;
|
||||
# services.openssh.enable = true;
|
||||
}
|
||||
'';
|
||||
|
||||
|
@ -246,6 +246,6 @@ in
|
|||
# Allow sshd to be started manually through "start sshd". It should
|
||||
# not be started by default on the installation CD because the
|
||||
# default root password is empty.
|
||||
services.sshd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
|
||||
|
||||
# Don't include X libraries.
|
||||
services.sshd.forwardX11 = false;
|
||||
services.openssh.forwardX11 = false;
|
||||
services.dbus.enable = false; # depends on libX11
|
||||
services.hal.enable = false; # depends on dbus
|
||||
fonts.enableFontConfig = false;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
|
||||
|
||||
# Don't include X libraries.
|
||||
services.sshd.forwardX11 = false;
|
||||
services.openssh.forwardX11 = false;
|
||||
services.dbus.enable = false; # depends on libX11
|
||||
services.hal.enable = false; # depends on dbus
|
||||
fonts.enableFontConfig = false;
|
||||
|
|
|
@ -22,7 +22,7 @@ let
|
|||
|
||||
# Add your own options below and run "nixos-rebuild switch".
|
||||
# E.g.,
|
||||
# services.sshd.enable = true;
|
||||
# services.openssh.enable = true;
|
||||
}
|
||||
'';
|
||||
|
||||
|
@ -173,6 +173,6 @@ in
|
|||
# Allow sshd to be started manually through "start sshd". It should
|
||||
# not be started by default on the installation CD because the
|
||||
# default root password is empty.
|
||||
services.sshd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
[ { # SSH configuration. Slight duplication of the sshd_config
|
||||
# generation in the sshd service.
|
||||
source = pkgs.writeText "ssh_config" ''
|
||||
${if config.services.sshd.forwardX11 then ''
|
||||
${if config.services.openssh.forwardX11 then ''
|
||||
ForwardX11 yes
|
||||
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
|
||||
'' else ''
|
||||
|
|
|
@ -123,7 +123,7 @@ in
|
|||
target = "ssh/moduli";
|
||||
};
|
||||
|
||||
jobs.openssh = {
|
||||
jobs.sshd = {
|
||||
|
||||
description = "OpenSSH server";
|
||||
|
||||
|
|
|
@ -83,8 +83,8 @@ with pkgs.lib;
|
|||
|
||||
# Allow root logins only using the SSH key that the user specified
|
||||
# at instance creation time.
|
||||
services.sshd.enable = true;
|
||||
services.sshd.permitRootLogin = "without-password";
|
||||
services.openssh.enable = true;
|
||||
services.openssh.permitRootLogin = "without-password";
|
||||
|
||||
# Obtain the SSH key and host name at startup time.
|
||||
jobs.fetchEC2Data =
|
||||
|
|
|
@ -6,7 +6,7 @@ let
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
services.sshd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
|
||||
services.httpd.enable = true;
|
||||
services.httpd.adminAddr = "foo@example.org";
|
||||
|
|
|
@ -11,7 +11,7 @@ in
|
|||
|
||||
{
|
||||
|
||||
services.sshd = {
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
permitRootLogin = "yes";
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
postgresql =
|
||||
{config, pkgs, ...}:
|
||||
{
|
||||
services.sshd.enable = true;
|
||||
services.openssh.enable = true;
|
||||
services.postgresql.enable = true;
|
||||
services.postgresql.enableTCPIP = true;
|
||||
services.postgresql.authentication = ''
|
||||
|
|
Loading…
Reference in a new issue