From 24c1c09590bcede94edc80880544632d05ffc2df Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 6 Dec 2017 14:29:41 +0100
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ymir.nix | 17 ++++++++---------
 1 file 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 {
     rsaKeyFile = "/var/lib/acme/yggdrasil.li/key.pem";
     rsaCertFile = "/var/lib/acme/yggdrasil.li/fullchain.pem";
     extraConfig = ''
-      log_ftp_protocol=yes
-      xferlog_enable=yes
+      log_ftp_protocol=YES
+      xferlog_enable=YES
     
       pam_service_name=vsftpd
 
-      port_enable=no
+      port_enable=NO
 
-      pasv_enable=yes
+      pasv_enable=YES
       pasv_max_port=21000
       pasv_min_port=20000
 
-      allow_writeable_chroot=yes
+      allow_writeable_chroot=YES
 
-      guest_enable=yes
+      guest_enable=YES
       guest_username=vsftpd
-      virtual_use_local_privs=yes
+      virtual_use_local_privs=YES
       user_sub_token=$USER
       local_root=/srv/ftp/$USER
-      hide_ids=yes
+      hide_ids=YES
     '';
   };
 
   security.pam.services."vsftpd".text = ''
     auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
     account required pam_permit.so
-    session required pam_permit.so
   '';
 }
-- 
cgit v1.2.3