From 31afd2bb2e9a2d3474dfc9c3d61fb17e23985841 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Jul 2011 09:42:20 +0000 Subject: [PATCH] * vsftpd: use /var/empty instead of /var/ftp/empty as the empty chroot (the latter doesn't exist). * vsftpd: make the anonymous user's home read-only, otherwise vsftpd will fail. svn path=/nixos/trunk/; revision=27983 --- modules/services/networking/vsftpd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix index f891a92e7f5..837f44c4213 100644 --- a/modules/services/networking/vsftpd.nix +++ b/modules/services/networking/vsftpd.nix @@ -120,11 +120,11 @@ in background=NO listen=YES nopriv_user=vsftpd - secure_chroot_dir=/var/ftp/empty + secure_chroot_dir=/var/empty EOF ${if cfg.anonymousUser then '' - mkdir -p ${cfg.anonymousUserHome} + mkdir -p -m 555 ${cfg.anonymousUserHome} chown -R ftp:ftp ${cfg.anonymousUserHome} '' else ""} '';