From 29cca0f34cc7b74d7eea36a8e4e15e816b1caa3b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:25:57 +0000
Subject: [PATCH] Convert "syslogd"

svn path=/nixos/branches/fix-style/; revision=14367
---
 system/options.nix       | 14 +---------
 upstart-jobs/default.nix |  6 -----
 upstart-jobs/syslogd.nix | 58 +++++++++++++++++++++++++++++++---------
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 4cff3ac92964..9d54bc9d8389 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -383,19 +383,6 @@ in
   services = {
 
   
-    syslogd = {
-
-      tty = mkOption {
-        default = 10;
-        description = "
-          The tty device on which syslogd will print important log
-          messages.
-        ";
-      };
-    
-    };
-
-
     ttyBackgrounds = {
 
       enable = mkOption {
@@ -1775,6 +1762,7 @@ in
     (import ../upstart-jobs/pulseaudio.nix)
     (import ../upstart-jobs/kbd.nix)
     (import ../upstart-jobs/gw6c.nix) # Gateway6
+    (import ../upstart-jobs/syslogd.nix)
 
     (import ../upstart-jobs/nix.nix) # nix options and daemon
     (import ../system/nixos-installer.nix)
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 7edff43c08cd..6dad24c35b34 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Syslogd.
-    (import ../upstart-jobs/syslogd.nix {
-      inherit (pkgs) sysklogd writeText;
-      inherit config;
-    })
-
     # Klogd.
     (import ../upstart-jobs/klogd.nix {
       inherit (pkgs) sysklogd writeText;
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index c255eb0d9a89..bc293936982b 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -1,8 +1,32 @@
-{sysklogd, writeText, config}:
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+
+      syslogd = {
+
+        tty = mkOption {
+          default = 10;
+          description = "
+            The tty device on which syslogd will print important log
+            messages.
+          ";
+        };
+      
+      };
+    };
+  };
+in
+
+###### implementation
 
 let
 
-  syslogConf = writeText "syslog.conf" ''
+  syslogConf = pkgs.writeText "syslog.conf" ''
     kern.warning;*.err;authpriv.none /dev/tty10
 
     # Send emergency messages to all users.
@@ -22,16 +46,24 @@ let
 in
 
 {
-  name = "syslogd";
-  
-  job = ''
-    description "Syslog daemon"
-  
-    start on udev
-    stop on shutdown
+  require = [
+    options
+  ];
 
-    env TZ=${config.time.timeZone}
-    
-    respawn ${sysklogd}/sbin/syslogd -n -f ${syslogConf}
-  '';
+  services = {
+    extraJobs = [{
+        name = "syslogd";
+        
+        job = ''
+          description "Syslog daemon"
+        
+          start on udev
+          stop on shutdown
+
+          env TZ=${config.time.timeZone}
+          
+          respawn ${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}
+        '';
+    }];
+  };
 }