From 63742a942e5cbf1d254f89506b382a0524237a3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jul 2012 17:08:27 -0400
Subject: [PATCH] Don't create /var/log/upstart/<jobname> unless necessary

---
 modules/system/upstart/upstart.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 1bfde9fc60e..961b3ad3cba 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -487,11 +487,11 @@ in
     services.dbus.packages = [ upstart ];
 
     system.activationScripts.chownJobLogs = stringAfter ["var"] 
-    (concatMapStrings (job: ''
-      touch /var/log/upstart/${job.name}
-      ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
-      ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
-    '') (attrValues config.jobs));
+      (concatMapStrings (job: optionalString (job.setuid != "" || job.setgid != "") ''
+        touch /var/log/upstart/${job.name}
+        ${optionalString (job.setuid != "") "chown ${job.setuid} /var/log/upstart/${job.name}"}
+        ${optionalString (job.setgid != "") "chown :${job.setgid} /var/log/upstart/${job.name}"}
+      '') (attrValues config.jobs));
 
   };