From 3da504ab6a400641f8518ef573c750082bf04d91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Jan 2008 17:11:36 +0000
Subject: [PATCH] * Disable mod_unique_id because it fails when the machine
 doesn't have   an IP address yet. * Create /var/run/httpd, /var/log/httpd
 automatically.

svn path=/nixos/trunk/; revision=10064
---
 upstart-jobs/apache-httpd/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 937f7ce18172..0273497d9123 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -26,7 +26,7 @@ let
 
       # Other modules.
       "ext_filter" "include" "log_config" "env" "mime_magic"
-      "cern_meta" "expires" "headers" "usertrack" "unique_id" "setenvif"
+      "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite"
@@ -224,6 +224,11 @@ in
     start on ${startingDependency}/started
     stop on shutdown
 
+    start script
+      mkdir -m 0700 -p ${cfg.stateDir}
+      mkdir -m 0700 -p ${cfg.logDir}
+    end script
+
     respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
   '';