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

Fix an assertion set in the wrong place

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-25 15:47:30 +02:00
parent ab94ccfc38
commit 72ca782044
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/modules/programs/ssh.nix
View File

@ -1,6 +1,6 @@
# Global configuration for the SSH client. # Global configuration for the SSH client.
{config, pkgs, ...}: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -31,7 +31,7 @@ in
setXAuthLocation = mkOption { setXAuthLocation = mkOption {
default = true; default = true;
description = '' description = ''
Whether to set the path to xauth for X11-forwarded connections. Whether to set the path to <command>xauth</command> for X11-forwarded connections.
Pulls in X11 dependency. Pulls in X11 dependency.
''; '';
}; };
@ -46,10 +46,13 @@ in
}; };
}; };
assertions = [{ assertion = if cfg.forwardX11 then cfg.setXAuthLocation else true;
message = "cannot enable X11 forwarding without setting xauth location";}];
config = { config = {
assertions = singleton
{ assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
message = "cannot enable X11 forwarding without setting XAuth location";
};
environment.etc = environment.etc =
[ { # 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.