From c887a5be1ed12380f12920146d0e188d77d93a7a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 7 Mar 2009 18:01:42 +0000
Subject: [PATCH] Fixing vsftpd without anonymous users, adding localUsers, and
 creating chroot path.

 Author:    viric @ rev 14286

svn path=/nixos/branches/fix-style/; revision=14446
---
 upstart-jobs/vsftpd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/vsftpd.nix b/upstart-jobs/vsftpd.nix
index 22d11eab51b..1cbd2ac092b 100644
--- a/upstart-jobs/vsftpd.nix
+++ b/upstart-jobs/vsftpd.nix
@@ -20,6 +20,13 @@ let
             Whether to enable the anonymous FTP user.
           ";
         };
+ 
+        localUsers = mkOption {
+          default = false;
+          description = "
+            Whether to enable FTP for the local users.
+          ";
+        };
 
         writeEnable = mkOption {
           default = false;
@@ -50,7 +57,7 @@ in
 
 let 
 
-  inherit (config.services.vsftpd) anonymousUser writeEnable anonymousUploadEnable anonymousMkdirEnable;
+  inherit (config.services.vsftpd) anonymousUser localUsers writeEnable anonymousUploadEnable anonymousMkdirEnable;
   inherit (pkgs) vsftpd;
 
   yesNoOption = p : name :
@@ -99,6 +106,7 @@ mkIf config.services.vsftpd.enable {
         start script
         cat > /etc/vsftpd.conf <<EOF
         ${yesNoOption anonymousUser "anonymous_enable"}
+        ${yesNoOption localUsers "local_enable"}
         ${yesNoOption writeEnable "write_enable"}
         ${yesNoOption anonymousUploadEnable "anon_upload_enable"}
         ${yesNoOption anonymousMkdirEnable "anon_mkdir_write_enable"}