From 3979844e229d46b48b2699fec63f7b60a20bf238 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Apr 2008 12:50:47 +0000
Subject: [PATCH] * Purify syslog.conf (it doesn't have to be in /etc).

svn path=/nixos/trunk/; revision=11436
---
 etc/default.nix          |  5 -----
 etc/syslog.conf          |  3 ---
 upstart-jobs/default.nix |  2 +-
 upstart-jobs/syslogd.nix | 18 ++++++++++++++++--
 4 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 etc/syslog.conf

diff --git a/etc/default.nix b/etc/default.nix
index 1e924e0f7f4b..e169b806e31e 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -62,11 +62,6 @@ import ../helpers/make-etc.nix {
       target = "nsswitch.conf";
     }
 
-    { # Configuration file for the system logging daemon.
-      source = ./syslog.conf;
-      target = "syslog.conf";
-    }
-
     { # Friendly greeting on the virtual consoles.
       source = pkgs.writeText "issue" ''
       
diff --git a/etc/syslog.conf b/etc/syslog.conf
deleted file mode 100644
index f89bcc6b2adc..000000000000
--- a/etc/syslog.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-*.* /dev/tty10
-
-*.* -/var/log/messages
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5ccb79f663a5..557652156f54 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -75,7 +75,7 @@ let
     [
     # Syslogd.
     (import ../upstart-jobs/syslogd.nix {
-      inherit (pkgs) sysklogd;
+      inherit (pkgs) sysklogd writeText;
     })
 
     # The udev daemon creates devices nodes and runs programs when
diff --git a/upstart-jobs/syslogd.nix b/upstart-jobs/syslogd.nix
index 0fbc92e87310..ef5de195f61a 100644
--- a/upstart-jobs/syslogd.nix
+++ b/upstart-jobs/syslogd.nix
@@ -1,10 +1,24 @@
-{sysklogd}:
+{sysklogd, writeText}:
+
+let
+
+  syslogConf = writeText "syslog.conf" ''
+    *.*                /dev/tty10
+
+    *.=warning;*.=err -/var/log/warn
+    *.crit             /var/log/warn
+
+
+    *.*               -/var/log/messages
+  '';
+
+in
 
 {
   name = "syslogd";
   job = "
     start on udev
     stop on shutdown
-    respawn ${sysklogd}/sbin/syslogd -n
+    respawn ${sysklogd}/sbin/syslogd -n -f ${syslogConf}
   ";
 }