Convert "jboss" (untested)

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

1 files changed, 70 insertions, 9 deletions

diff --git a/upstart-jobs/jboss.nix b/upstart-jobs/jboss.nix
index 6c35fe06436..322ed92b920 100644
--- a/upstart-jobs/jboss.nix
+++ b/upstart-jobs/jboss.nix
@@ -1,21 +1,82 @@
-args: with args;
+{pkgs, config, ...}:
 
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      jboss = {
+        enable = mkOption {
+          default = false;
+          description = "Whether to enable jboss";
+        };
+
+        tempDir = mkOption {
+          default = "/tmp";
+          description = "Location where JBoss stores its temp files";
+        };
+        
+        logDir = mkOption {
+          default = "/var/log/jboss";
+          description = "Location of the logfile directory of JBoss";
+        };
+        
+        serverDir = mkOption {
+          description = "Location of the server instance files";
+          default = "/var/jboss/server";
+        };
+        
+        deployDir = mkOption {
+          description = "Location of the deployment files";
+          default = "/nix/var/nix/profiles/default/server/default/deploy/";
+        };
+        
+        libUrl = mkOption {
+          default = "file:///nix/var/nix/profiles/default/server/default/lib";
+          description = "Location where the shared library JARs are stored";
+        };
+        
+        user = mkOption {
+          default = "nobody";
+          description = "User account under which jboss runs.";
+        };
+        
+        useJK = mkOption {
+          default = false;
+          description = "Whether to use to connector to the Apache HTTP server";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
 let
 
 cfg = config.services.jboss;
-jbossService = import ../services/jboss {
+jbossService = import ../../services/jboss {
         inherit (pkgs) stdenv jboss su;
         inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
 };
 
 in
-{
-        name = "jboss";
-        job = "
-description \"JBoss server\"
 
-stop on shutdown
+mkIf config.services.jboss.enable {
+  require = [
+    options
+  ];
+
+  services = {
+    extraJobs = [{
+      name = "jboss";
+      job = ''
+          description \"JBoss server\"
+
+          stop on shutdown
 
-respawn ${jbossService}/bin/control start
-        ";
+          respawn ${jbossService}/bin/control start
+      '';
+    }];
+  };
 }