summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/ymir.nix b/ymir.nix
index fcf18658..d1feb2d8 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -987,31 +987,30 @@ in rec {
987 rsaKeyFile = "/var/lib/acme/yggdrasil.li/key.pem"; 987 rsaKeyFile = "/var/lib/acme/yggdrasil.li/key.pem";
988 rsaCertFile = "/var/lib/acme/yggdrasil.li/fullchain.pem"; 988 rsaCertFile = "/var/lib/acme/yggdrasil.li/fullchain.pem";
989 extraConfig = '' 989 extraConfig = ''
990 log_ftp_protocol=yes 990 log_ftp_protocol=YES
991 xferlog_enable=yes 991 xferlog_enable=YES
992 992
993 pam_service_name=vsftpd 993 pam_service_name=vsftpd
994 994
995 port_enable=no 995 port_enable=NO
996 996
997 pasv_enable=yes 997 pasv_enable=YES
998 pasv_max_port=21000 998 pasv_max_port=21000
999 pasv_min_port=20000 999 pasv_min_port=20000
1000 1000
1001 allow_writeable_chroot=yes 1001 allow_writeable_chroot=YES
1002 1002
1003 guest_enable=yes 1003 guest_enable=YES
1004 guest_username=vsftpd 1004 guest_username=vsftpd
1005 virtual_use_local_privs=yes 1005 virtual_use_local_privs=YES
1006 user_sub_token=$USER 1006 user_sub_token=$USER
1007 local_root=/srv/ftp/$USER 1007 local_root=/srv/ftp/$USER
1008 hide_ids=yes 1008 hide_ids=YES
1009 ''; 1009 '';
1010 }; 1010 };
1011 1011
1012 security.pam.services."vsftpd".text = '' 1012 security.pam.services."vsftpd".text = ''
1013 auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd 1013 auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
1014 account required pam_permit.so 1014 account required pam_permit.so
1015 session required pam_permit.so
1016 ''; 1015 '';
1017} 1016}