diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-03-09 03:02:29 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-03-09 03:02:29 +0000 |
| commit | b27de68c4e18e6fcacac48c1c14525ce7bccc471 (patch) | |
| tree | 2f6fdbd65977dd6f8b2eda8a74ac302ded0598f6 /nixos/modules | |
| parent | e3ae435aad201ed5a4e0de551f20a77582a550e3 (diff) | |
| parent | 973219c97327a59d787fab9e41aee78e12d30f51 (diff) | |
| download | nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar.gz nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar.bz2 nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar.lz nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar.xz nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.tar.zst nixlib-b27de68c4e18e6fcacac48c1c14525ce7bccc471.zip | |
Merge pull request #13777 from eqyiel/upstream
vsftpd: Add possibility to specify path to RSA key file
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/networking/vsftpd.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index e7301e9ef5f5..7ec484941ede 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -85,6 +85,9 @@ let ssl_enable=YES rsa_cert_file=${cfg.rsaCertFile} ''} + ${optionalString (cfg.rsaKeyFile != null) '' + rsa_private_key_file=${cfg.rsaKeyFile} + ''} ${optionalString (cfg.userlistFile != null) '' userlist_file=${cfg.userlistFile} ''} @@ -147,6 +150,12 @@ in description = "RSA certificate file."; }; + rsaKeyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "RSA private key file."; + }; + anonymousUmask = mkOption { type = types.string; default = "077"; |