movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #13777 from eqyiel/upstream

Browse source 
vsftpd: Add possibility to specify path to RSA key file
This commit is contained in:
Michael Raskin 2016-03-09 03:02:29 +00:00
commit b27de68c4e
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/networking/vsftpd.nix
View file

@ -85,6 +85,9 @@ let
ssl_enable=YES ssl_enable=YES
rsa_cert_file=${cfg.rsaCertFile} rsa_cert_file=${cfg.rsaCertFile}
''} ''}
${optionalString (cfg.rsaKeyFile != null) ''
rsa_private_key_file=${cfg.rsaKeyFile}
''}
${optionalString (cfg.userlistFile != null) '' ${optionalString (cfg.userlistFile != null) ''
userlist_file=${cfg.userlistFile} userlist_file=${cfg.userlistFile}
''} ''}
@ -147,6 +150,12 @@ in
description = "RSA certificate file."; description = "RSA certificate file.";
}; };
rsaKeyFile = mkOption {
type = types.nullOr types.path;
default = null;
description = "RSA private key file.";
};
anonymousUmask = mkOption { anonymousUmask = mkOption {
type = types.string; type = types.string;
default = "077"; default = "077";