Convert "ejabbered" (untested)

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

system/options.nix

@@ -480,33 +480,6 @@ in
     };
 
 
-    ejabberd = {
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable ejabberd server";
-      };
-            
-      spoolDir = mkOption {
-        default = "/var/lib/ejabberd";
-        description = "Location of the spooldir of ejabberd";
-      };
-      
-      logsDir = mkOption {
-        default = "/var/log/ejabberd";
-        description = "Location of the logfile directory of ejabberd";
-      };
-      
-      confDir = mkOption {
-        default = "/var/ejabberd";
-	description = "Location of the config directory of ejabberd";
-      };
-      
-      virtualHosts = mkOption {
-        default = "\"localhost\"";
-        description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
-      };
-    };
-
     jboss = {
       enable = mkOption {
         default = false;
@@ -1369,6 +1342,7 @@ in
     (import ../upstart-jobs/portmap.nix)
     (import ../upstart-jobs/bitlbee.nix)
     (import ../upstart-jobs/gnunet.nix)
+    (import ../upstart-jobs/ejabberd.nix) # untested, dosen't compile on x86_64-linux
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon

upstart-jobs/default.nix

@@ -168,12 +168,6 @@ let
       inherit config pkgs;
     })
 
-  # EJabberd service
-  ++ optional config.services.ejabberd.enable
-    (import ../upstart-jobs/ejabberd.nix {
-      inherit config pkgs;
-    })  
-
   # OpenFire XMPP server
   ++ optional config.services.openfire.enable
     (import ../upstart-jobs/openfire.nix {

upstart-jobs/ejabberd.nix

@@ -1,11 +1,58 @@
-args: with args;
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      ejabberd = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable ejabberd server";
+        };
+              
+        spoolDir = mkOption {
+          default = "/var/lib/ejabberd";
+          description = "Location of the spooldir of ejabberd";
+        };
+        
+        logsDir = mkOption {
+          default = "/var/log/ejabberd";
+          description = "Location of the logfile directory of ejabberd";
+        };
+        
+        confDir = mkOption {
+          default = "/var/ejabberd";
+          description = "Location of the config directory of ejabberd";
+        };
+        
+        virtualHosts = mkOption {
+          default = "\"localhost\"";
+          description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
 cfg = config.services.ejabberd;
 
 in
-{
+
+mkIf config.services.ejabberd.enable {
+
+  require = [
+    options
+  ];
+
+
+  services = {
+    extraJobs = [{
       name = "ejabberd";
           
       job = ''
@@ -33,4 +80,6 @@ in
             ${pkgs.ejabberd}/sbin/ejabberdctl stop
         end script
       '';
+    }];
+  };
 }