Author: eelco
Date: Tue Nov  1 13:44:48 2011
New Revision: 30161
URL: https://nixos.org/websvn/nix/?rev=30161&sc=1

Log:
* Start httpd after postgresql since the mediawiki subservice depends
  on it.

Modified:
   nixos/trunk/modules/services/web-servers/apache-httpd/default.nix

Modified: nixos/trunk/modules/services/web-servers/apache-httpd/default.nix
==============================================================================
--- nixos/trunk/modules/services/web-servers/apache-httpd/default.nix   Tue Nov 
 1 02:53:37 2011        (r30160)
+++ nixos/trunk/modules/services/web-servers/apache-httpd/default.nix   Tue Nov 
 1 13:44:48 2011        (r30161)
@@ -555,7 +555,12 @@
 
         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 ":" (
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to