Convert "vsftpd"

svn path=/nixos/branches/fix-style/; revision=14383

system/options.nix

@@ -479,43 +479,6 @@ in
 
     };
 
-    vsftpd = {
-      enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the vsftpd FTP server.
-        ";
-      };
-      
-      anonymousUser = mkOption {
-        default = false;
-        description = "
-          Whether to enable the anonymous FTP user.
-        ";
-      };
-
-      writeEnable = mkOption {
-        default = false;
-        description = "
-          Whether any write activity is permitted to users.
-        ";
-      };
-
-      anonymousUploadEnable = mkOption {
-        default = false;
-        description = "
-          Whether any uploads are permitted to anonymous users.
-        ";
-      };
-
-      anonymousMkdirEnable = mkOption {
-        default = false;
-        description = "
-          Whether mkdir is permitted to anonymous users.
-        ";
-      };
-    };
-    
     printing = {
 
       enable = mkOption {
@@ -1062,6 +1025,7 @@ in
     (import ../upstart-jobs/tomcat.nix) # untested, too lazy to get that jdk
     (import ../upstart-jobs/httpd.nix) # Apache httpd (probably this can be removed ?)
     (import ../upstart-jobs/apache-httpd) # Apache httpd (new style).
+    (import ../upstart-jobs/vsftpd.nix)
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon

upstart-jobs/default.nix

@@ -172,14 +172,6 @@ let
       inherit config pkgs modprobe;
     })
 
-  # VSFTPd server
-  ++ optional config.services.vsftpd.enable
-    (import ../upstart-jobs/vsftpd.nix {
-      inherit (pkgs) vsftpd;
-      inherit (config.services.vsftpd) anonymousUser 
-        writeEnable anonymousUploadEnable anonymousMkdirEnable;
-    })
-
   # X Font Server
   ++ optional config.services.xfs.enable
     (import ../upstart-jobs/xfs.nix {

upstart-jobs/vsftpd.nix

@@ -1,80 +1,120 @@
-{ vsftpd, anonymousUser
-, anonymousUploadEnable, anonymousMkdirEnable, writeEnable
-}:
+{pkgs, config, ...}:
 
-{
-  name = "vsftpd";
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
 
-  groups = [
-    { name = "ftp";
-      gid = (import ../system/ids.nix).gids.ftp;
-    }
+  options = {
+    services = {
+      vsftpd = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the vsftpd FTP server.
+          ";
+        };
+        
+        anonymousUser = mkOption {
+          default = false;
+          description = "
+            Whether to enable the anonymous FTP user.
+          ";
+        };
+
+        writeEnable = mkOption {
+          default = false;
+          description = "
+            Whether any write activity is permitted to users.
+          ";
+        };
+
+        anonymousUploadEnable = mkOption {
+          default = false;
+          description = "
+            Whether any uploads are permitted to anonymous users.
+          ";
+        };
+
+        anonymousMkdirEnable = mkOption {
+          default = false;
+          description = "
+            Whether mkdir is permitted to anonymous users.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let 
+
+  inherit (config.services.vsftpd) anonymousUser writeEnable anonymousUploadEnable anonymousMkdirEnable;
+  inherit (pkgs) vsftpd;
+
+  yesNoOption = p : name :
+    "${name}=${if p then "YES" else "NO"}";
+
+in
+
+mkIf config.services.vsftpd.enable {
+  require = [
+    options
   ];
-  
-  users = [
-    { name = "vsftpd";
-      uid = (import ../system/ids.nix).uids.vsftpd;
-      description = "VSFTPD user";
-      home = "/homeless-shelter";
-    }
-  ] ++
-  (if anonymousUser 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
+  users = {
+    extraUsers = [
+        { name = "vsftpd";
+          uid = (import ../system/ids.nix).uids.vsftpd;
+          description = "VSFTPD user";
+          home = "/homeless-shelter";
+        }
+      ] ++ pkgs.lib.optional anonymousUser
+        { name = "ftp";
+          uid = (import ../system/ids.nix).uids.ftp;
+          group = "ftp";
+          description = "Anonymous ftp user";
+          home = "/home/ftp";
+        };
 
-start script
-    cat > /etc/vsftpd.conf <<EOF
-" + 
-    (if anonymousUser then 
-"anonymous_enable=YES"
-    else
-"anonymous_enable=NO") +
-(if writeEnable then 
-"
-write_enable=YES"
-else
-"
-write_enable=NO"
-) +
-(if anonymousUploadEnable then 
-"
-anon_upload_enable=YES"
-else
-"
-anon_upload_enable=NO"
-) +
-(if anonymousMkdirEnable then 
-"
-anon_mkdir_write_enable=YES"
-else
-"
-anon_mkdir_write_enable=NO"
-) +
-"
-background=NO
-listen=YES
-nopriv_user=vsftpd
-secure_chroot_dir=/var/ftp/empty
-EOF
+    extraGroups = [
+      { name = "ftp";
+        gid = (import ../system/ids.nix).gids.ftp;
+      }
+    ];
+      
+  };
 
-    mkdir -p /home/ftp &&
-    chown -R ftp:ftp /home/ftp
-end script
+  services = {
+    extraJobs = [{
+      name = "vsftpd";
 
-respawn ${vsftpd}/sbin/vsftpd /etc/vsftpd.conf
-  ";
-  
+      job = ''
+        description "vsftpd server"
+
+        start on network-interfaces/started
+        stop on network-interfaces/stop
+
+        start script
+        cat > /etc/vsftpd.conf <<EOF
+        ${yesNoOption anonymousUser "anonymous_enable"}
+        ${yesNoOption writeEnable "write_enable"}
+        ${yesNoOption anonymousUploadEnable "anon_upload_enable"}
+        ${yesNoOption anonymousMkdirEnable "anon_mkdir_write_enable"}
+        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
+      '';
+      
+    }];
+  };
 }