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

Update users of `services.sshd'.

Browse Source 
svn path=/nixos/trunk/; revision=20575
This commit is contained in:
Ludovic Courtès 2010-03-11 17:02:53 +00:00
parent d1b4b7fd28
commit 8e16742b79
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -112,7 +112,7 @@ let
# Add your own options below and run "nixos-rebuild switch". # Add your own options below and run "nixos-rebuild switch".
# E.g., # 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 # Allow sshd to be started manually through "start sshd". It should
# not be started by default on the installation CD because the # not be started by default on the installation CD because the
# default root password is empty. # default root password is empty.
services.sshd.enable = true; services.openssh.enable = true;
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
} }

2
modules/installer/cd-dvd/installation-cd-minimal.nix
View File

@ -9,7 +9,7 @@
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
# Don't include X libraries. # Don't include X libraries.
services.sshd.forwardX11 = false; services.openssh.forwardX11 = false;
services.dbus.enable = false; # depends on libX11 services.dbus.enable = false; # depends on libX11
services.hal.enable = false; # depends on dbus services.hal.enable = false; # depends on dbus
fonts.enableFontConfig = false; fonts.enableFontConfig = false;

2
modules/installer/cd-dvd/installation-cd-rescue.nix
View File

@ -9,7 +9,7 @@
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
# Don't include X libraries. # Don't include X libraries.
services.sshd.forwardX11 = false; services.openssh.forwardX11 = false;
services.dbus.enable = false; # depends on libX11 services.dbus.enable = false; # depends on libX11
services.hal.enable = false; # depends on dbus services.hal.enable = false; # depends on dbus
fonts.enableFontConfig = false; fonts.enableFontConfig = false;

4
modules/installer/cd-dvd/system-tarball-pc.nix
View File

@ -22,7 +22,7 @@ let
# Add your own options below and run "nixos-rebuild switch". # Add your own options below and run "nixos-rebuild switch".
# E.g., # 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 # Allow sshd to be started manually through "start sshd". It should
# not be started by default on the installation CD because the # not be started by default on the installation CD because the
# default root password is empty. # default root password is empty.
services.sshd.enable = true; services.openssh.enable = true;
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
} }

2
modules/programs/ssh.nix
View File

@ -7,7 +7,7 @@
[ { # SSH configuration. Slight duplication of the sshd_config [ { # SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service. # generation in the sshd service.
source = pkgs.writeText "ssh_config" '' source = pkgs.writeText "ssh_config" ''
${if config.services.sshd.forwardX11 then '' ${if config.services.openssh.forwardX11 then ''
ForwardX11 yes ForwardX11 yes
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
'' else '' '' else ''

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

@ -123,7 +123,7 @@ in
target = "ssh/moduli"; target = "ssh/moduli";
}; };
jobs.openssh = { jobs.sshd = {
description = "OpenSSH server"; description = "OpenSSH server";

4
modules/virtualisation/amazon-image.nix
View File

@ -83,8 +83,8 @@ with pkgs.lib;
# Allow root logins only using the SSH key that the user specified # Allow root logins only using the SSH key that the user specified
# at instance creation time. # at instance creation time.
services.sshd.enable = true; services.openssh.enable = true;
services.sshd.permitRootLogin = "without-password"; services.openssh.permitRootLogin = "without-password";
# Obtain the SSH key and host name at startup time. # Obtain the SSH key and host name at startup time.
jobs.fetchEC2Data = jobs.fetchEC2Data =

2
tests/proxy.nix
View File

@ -6,7 +6,7 @@ let
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.sshd.enable = true; services.openssh.enable = true;
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";

2
tests/test-nixos-install-from-cd/module-insecure.nix
View File

@ -11,7 +11,7 @@ in
{ {
services.sshd = { services.openssh = {
enable = true; enable = true;
permitRootLogin = "yes"; permitRootLogin = "yes";
}; };

2
tests/trac.nix
View File

@ -16,7 +16,7 @@
postgresql = postgresql =
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
services.sshd.enable = true; services.openssh.enable = true;
services.postgresql.enable = true; services.postgresql.enable = true;
services.postgresql.enableTCPIP = true; services.postgresql.enableTCPIP = true;
services.postgresql.authentication = '' services.postgresql.authentication = ''