Convert "irc-hybrid"

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

system/options.nix

@@ -479,78 +479,6 @@ in
 
     };
 
-    ircdHybrid = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Enable IRCD.
-        ";
-      };
-
-      serverName = mkOption {
-        default = "hades.arpa";
-        description = "
-          IRCD server name.
-        ";
-      };
-
-      sid = mkOption {
-        default = "0NL";
-        description = "
-          IRCD server unique ID in a net of servers.
-        ";
-      };
-
-      description = mkOption {
-        default = "Hybrid-7 IRC server.";
-        description = "
-          IRCD server description.
-        ";
-      };
-
-      rsaKey = mkOption {
-        default = null;
-        example = /root/certificates/irc.key;
-        description = "
-          IRCD server RSA key. 
-        ";
-      };
-
-      certificate = mkOption {
-        default = null;
-        example = /root/certificates/irc.pem;
-        description = "
-          IRCD server SSL certificate. There are some limitations - read manual.
-        ";
-      };
-
-      adminEmail = mkOption {
-        default = "<bit-bucket@example.com>";
-        example = "<name@domain.tld>";
-        description = "
-          IRCD server administrator e-mail. 
-        ";
-      };
-
-      extraIPs = mkOption {
-        default = [];
-        example = ["127.0.0.1"];
-        description = "
-          Extra IP's to bind.
-        ";
-      };
-
-      extraPort = mkOption {
-        default = "7117";
-        description = "
-          Extra port to avoid filtering.
-        ";
-      };
-
-    };
-
-
     xfs = {
 
       enable = mkOption {
@@ -972,6 +900,7 @@ in
     (import ../upstart-jobs/cupsd.nix) # CUPS printing daemon
     (import ../upstart-jobs/udev.nix) # The udev daemon creates devices nodes and runs programs when hardware events occur.
     (import ../upstart-jobs/samba.nix) # TODO: doesn't start here (?)
+    (import ../upstart-jobs/ircd-hybrid.nix) # TODO: doesn't compile on x86_64-linux, can't test
 
     # nix
     (import ../upstart-jobs/nix.nix) # nix options and daemon

upstart-jobs/default.nix

@@ -155,11 +155,6 @@ let
       inherit config pkgs;
     })
 
-  ++ optional config.services.ircdHybrid.enable
-    (import ../upstart-jobs/ircd-hybrid.nix {
-      inherit config pkgs;
-    })
-
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {

upstart-jobs/ircd-hybrid.nix

@@ -1,38 +1,130 @@
-{config, pkgs}:
+{pkgs, config, ...}:
+
+###### interface
 let
-        cfg = config.services.ircdHybrid;
+  inherit (pkgs.lib) mkOption mkIf;
-        ircdService = import ../services/ircd-hybrid {
+
-                stdenv = pkgs.stdenv;
+  options = {
-                inherit (pkgs) ircdHybrid coreutils 
+    services = {
-                        su iproute gnugrep procps;
+      ircdHybrid = {
-                serverName = cfg.serverName;
+
-                sid = cfg.sid;
+        enable = mkOption {
-                description = cfg.description;
+          default = false;
-                rsaKey = cfg.rsaKey;
+          description = "
-                certificate = cfg.certificate;
+            Enable IRCD.
-                adminEmail = cfg.adminEmail;
+          ";
-                extraIPs = cfg.extraIPs;
-                extraPort = cfg.extraPort;
-                gw6cEnabled = (config.services.gw6c.enable) &&
-                        (config.services.gw6c.autorun);
         };
 
+        serverName = mkOption {
+          default = "hades.arpa";
+          description = "
+            IRCD server name.
+          ";
+        };
+
+        sid = mkOption {
+          default = "0NL";
+          description = "
+            IRCD server unique ID in a net of servers.
+          ";
+        };
+
+        description = mkOption {
+          default = "Hybrid-7 IRC server.";
+          description = "
+            IRCD server description.
+          ";
+        };
+
+        rsaKey = mkOption {
+          default = null;
+          example = /root/certificates/irc.key;
+          description = "
+            IRCD server RSA key. 
+          ";
+        };
+
+        certificate = mkOption {
+          default = null;
+          example = /root/certificates/irc.pem;
+          description = "
+            IRCD server SSL certificate. There are some limitations - read manual.
+          ";
+        };
+
+        adminEmail = mkOption {
+          default = "<bit-bucket@example.com>";
+          example = "<name@domain.tld>";
+          description = "
+            IRCD server administrator e-mail. 
+          ";
+        };
+
+        extraIPs = mkOption {
+          default = [];
+          example = ["127.0.0.1"];
+          description = "
+            Extra IP's to bind.
+          ";
+        };
+
+        extraPort = mkOption {
+          default = "7117";
+          description = "
+            Extra port to avoid filtering.
+          ";
+        };
+
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+  cfg = config.services.ircdHybrid;
+  ircdService = import ../../services/ircd-hybrid {
+    stdenv = pkgs.stdenv;
+    inherit (pkgs) ircdHybrid coreutils 
+            su iproute gnugrep procps;
+    serverName = cfg.serverName;
+    sid = cfg.sid;
+    description = cfg.description;
+    rsaKey = cfg.rsaKey;
+    certificate = cfg.certificate;
+    adminEmail = cfg.adminEmail;
+    extraIPs = cfg.extraIPs;
+    extraPort = cfg.extraPort;
+    gw6cEnabled = (config.services.gw6c.enable) &&
+            (config.services.gw6c.autorun);
+  };
+
   startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
 
 in
-{
-        name = "ircd-hybrid";
-        users = [ {
-                        name = "ircd"; 
-                        description = "IRCD owner.";
-                } ];
-        groups = [{name = "ircd";}];
-        job = "
-description = \"IRCD Hybrid server.\"
 
-start on ${startingDependency}/started
+mkIf config.services.ircdHybrid.enable {
-stop on ${startingDependency}/stop
+  require = [
+    options
+  ];
 
-respawn ${ircdService}/bin/control start
+  services = {
-";
+    extraJobs = [{
+      name = "ircd-hybrid";
+      users = [ {
+                      name = "ircd"; 
+                      description = "IRCD owner.";
+              } ];
+      groups = [{name = "ircd";}];
+      job = ''
+        description = "IRCD Hybrid server."
+
+        start on ${startingDependency}/started
+        stop on ${startingDependency}/stop
+
+        respawn ${ircdService}/bin/control start
+      '';
+    }];
+  };
 }