From e872efaa8d31875aa05332b6538707798bf6a5fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 17:43:54 +0000
Subject: [PATCH] fixed mongodb upstart task

svn path=/nixos/trunk/; revision=32683
---
 modules/services/databases/mongodb.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/services/databases/mongodb.nix b/modules/services/databases/mongodb.nix
index 1c46424c14b..caa6ebc5acf 100644
--- a/modules/services/databases/mongodb.nix
+++ b/modules/services/databases/mongodb.nix
@@ -96,8 +96,7 @@ in
 
     jobs.mongodb =
       { description = "MongoDB server";
-        daemonType = "none";
-        respawn = false; # seems to interfere with normal stopping
+        daemonType = "fork";
 
         startOn = "filesystem";
 
@@ -110,7 +109,6 @@ in
           '';
 
         exec = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf}\"";
-        preStop = "${pkgs.shadow}/bin/su ${cfg.user} -c \"${mongodb}/bin/mongod --config ${mongoCnf} --shutdown\"";
 
         extraConfig = "kill timeout 10";
       };