From 71e6f6ecdcdcf5bff6e5365f9209b2dfe8929997 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2011 13:44:48 +0000 Subject: [PATCH] * Start httpd after postgresql since the mediawiki subservice depends on it. svn path=/nixos/trunk/; revision=30161 --- modules/services/web-servers/apache-httpd/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix index 4894276e1d3..39f087e4ccf 100644 --- a/modules/services/web-servers/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -555,7 +555,12 @@ in description = "Apache HTTPD"; - startOn = "started ${startingDependency} and filesystem"; + startOn = "started ${startingDependency} and filesystem" + # Hacky. Some subservices depend on Postgres + # (e.g. Mediawiki), but they don't have a way to declare + # that dependency. So just start httpd after postgresql if + # the latter is enabled. + + optionalString config.services.postgresql.enable " and started postgresql"; environment = { PATH = concatStringsSep ":" (