Added vsftpd upstart job

svn path=/nixos/trunk/; revision=10540

system/ids.nix

@@ -8,6 +8,8 @@
     messagebus = 4; # D-Bus
     haldaemon = 5;
     nagios = 6;
+    vsftpd = 7;
+    ftp = 8;
     nixbld = 30000; # start of range of uids
     nobody = 65534;
   };
@@ -16,6 +18,8 @@
     root = 0;
     wheel = 1;
     haldaemon = 5;
+    vsftpd = 7;
+    ftp = 8;
     audio = 17;
     users = 100;
     nixbld = 30000;

system/options.nix

@@ -1365,7 +1365,22 @@
 
     };
 
-
+    vsftpd = {
+      enable = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the vsftpd FTP server.
+	";
+      };
+      
+      anonymous_user = mkOption {
+        default = false;
+	description = "
+	  Whether to enable the anonymous FTP user.
+	";
+      };
+    };
+    
     printing = {
 
       enable = mkOption {

upstart-jobs/default.nix

@@ -218,6 +218,13 @@ let
       inherit config pkgs;
     })
 
+  # VSFTPd server
+  ++ optional config.services.vsftpd.enable
+    (import ../upstart-jobs/vsftpd.nix {
+      inherit (pkgs) vsftpd;
+      inherit (config.services.vsftpd) anonymous_user;
+    })
+
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {

upstart-jobs/vsftpd.nix

@@ -0,0 +1,57 @@
+{ vsftpd, anonymous_user }:
+
+{
+  name = "vsftpd";
+
+  groups = [
+    { name = "ftp";
+      gid = (import ../system/ids.nix).gids.ftp;
+    }
+  ];
+  
+  users = [
+    { name = "vsftpd";
+      uid = (import ../system/ids.nix).uids.vsftpd;
+      description = "VSFTPD user";
+      home = "/homeless-shelter";
+    }
+  ] ++
+  (if anonymous_user then [
+    { name = "ftp";
+      uid = (import ../system/ids.nix).uids.ftp;
+      group = "ftp";
+      description = "Anonymous ftp user";
+      home = "/home/ftp";
+    } 
+  ]
+  else
+  []);
+  
+  job = "
+description \"vsftpd server\"
+
+start on network-interfaces/started
+stop on network-interfaces/stop
+
+start script
+    cat > /etc/vsftpd.conf <<EOF
+" + 
+    (if anonymous_user then 
+"anonymous_enable=YES"
+    else
+"anonymous_enable=NO") +
+"
+background=NO
+listen=YES
+nopriv_user=vsftpd
+secure_chroot_dir=/var/ftp/empty
+EOF
+
+    mkdir -p /home/ftp &&
+    chown -R ftp:ftp /home/ftp
+end script
+
+respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
+  ";
+  
+}