* Purify syslog.conf (it doesn't have to be in /etc).

svn path=/nixos/trunk/; revision=11436

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" ''
       

etc/syslog.conf

@@ -1,3 +0,0 @@
-*.* /dev/tty10
-
-*.* -/var/log/messages

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

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}
   ";
 }