vsftpd userlist options added

svn path=/nixos/trunk/; revision=14648
This commit is contained in:
Wouter den Breejen 2009-03-22 15:32:09 +00:00
parent 7b7a29b201
commit 1220a6da39
3 changed files with 34 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -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