vsftpd userlist options added

svn path=/nixos/trunk/; revision=14648

upstart-jobs/default.nix

@@ -309,7 +309,8 @@ let
     (import ../upstart-jobs/vsftpd.nix {
       inherit (pkgs) vsftpd;
       inherit (config.services.vsftpd) anonymousUser localUsers
-        writeEnable anonymousUploadEnable anonymousMkdirEnable;
+        writeEnable anonymousUploadEnable anonymousMkdirEnable
+        chrootlocaluser userlistenable userlistdeny;
     })
 
   # X Font Server

upstart-jobs/smb.conf

@@ -4,7 +4,14 @@
   server string = %h
   comment = Samba
   local master = no
-[default]
+
-  path = /home/smbd
+#[default]
+#  path = /home/smbd
+#  read only = no
+#  guest ok = yes
+
+[raidbackup]
+  path = /home/raidbackup
   read only = no
-  guest ok = yes
+  guest ok = no
+

upstart-jobs/vsftpd.nix

@@ -1,5 +1,6 @@
 { vsftpd, anonymousUser, localUsers
 , anonymousUploadEnable, anonymousMkdirEnable, writeEnable
+, chrootlocaluser, userlistenable, userlistdeny
 }:
 
 {
@@ -70,6 +71,27 @@ else
 "
 anon_mkdir_write_enable=NO"
 ) +
+(if chrootlocaluser then
+"
+chroot_local_user=YES"
+else
+"
+chroot_local_user=NO"
+) +
+(if userlistenable then
+"
+userlist_enable=YES"
+else
+"
+userlist_enable=NO"
+) +
+(if userlistdeny then
+"
+userlist_deny=YES"
+else
+"
+userlist_deny=NO"
+) +
 "
 background=NO
 listen=YES