Author: eelco
Date: Thu Jul 28 09:42:20 2011
New Revision: 27983
URL: https://svn.nixos.org/websvn/nix/?rev=27983&sc=1
Log:
* 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.
Modified:
nixos/trunk/modules/services/networking/vsftpd.nix
Modified: nixos/trunk/modules/services/networking/vsftpd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/vsftpd.nix Thu Jul 28 09:41:07
2011 (r27982)
+++ nixos/trunk/modules/services/networking/vsftpd.nix Thu Jul 28 09:42:20
2011 (r27983)
@@ -120,11 +120,11 @@
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 ""}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
