From bd6fbce0f3c23f8937ab4f795364725ae48fec08 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 17 Sep 2009 07:39:21 +0000 Subject: * vsftpd typo svn path=/nixos/trunk/; revision=17215 --- modules/services/networking/vsftpd.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix index 5f8a06cbbb5..a0630de77cc 100644 --- a/modules/services/networking/vsftpd.nix +++ b/modules/services/networking/vsftpd.nix @@ -21,6 +21,13 @@ let "; }; + anonymousUserHome = mkOption { + default = "/home/ftp"; + description = " + Path to anonymous user data. + "; + }; + localUsers = mkOption { default = false; description = " @@ -78,7 +85,7 @@ in let - inherit (config.services.vsftpd) anonymousUser localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable + inherit (config.services.vsftpd) anonymousUser anonymousUserHome localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable chrootlocalUser userlistEnable userlistDeny; inherit (pkgs) vsftpd; @@ -104,7 +111,7 @@ mkIf config.services.vsftpd.enable { uid = config.ids.uids.ftp; group = "ftp"; description = "Anonymous ftp user"; - home = "/home/ftp"; + home = anonymousUserHome; }; extraGroups = [ @@ -141,8 +148,8 @@ mkIf config.services.vsftpd.enable { secure_chroot_dir=/var/ftp/empty EOF - mkdir -p /home/ftp && - chown -R ftp:ftp /home/ftp + mkdir -p ${anonymousUserHome} && + chown -R ftp:ftp ${anonymousUserHome} end script respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf -- cgit 1.4.1