Author: eelco Date: 2010-06-13 20:59:49 +0000 (Sun, 13 Jun 2010) New Revision: 22247
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22247&view=rev Modified: nixos/branches/boot-order/modules/services/databases/mysql.nix nixos/branches/boot-order/modules/services/databases/postgresql.nix Log: * PostgreSQL / MySQL: depend on the "filesystem" event. Changes: Modified: nixos/branches/boot-order/modules/services/databases/mysql.nix =================================================================== --- nixos/branches/boot-order/modules/services/databases/mysql.nix 2010-06-13 19:33:18 UTC (rev 22246) +++ nixos/branches/boot-order/modules/services/databases/mysql.nix 2010-06-13 20:59:49 UTC (rev 22247) @@ -100,7 +100,7 @@ jobs.mysql = { description = "MySQL server"; - startOn = "started network-interfaces"; + startOn = "filesystem"; preStart = '' Modified: nixos/branches/boot-order/modules/services/databases/postgresql.nix =================================================================== --- nixos/branches/boot-order/modules/services/databases/postgresql.nix 2010-06-13 19:33:18 UTC (rev 22246) +++ nixos/branches/boot-order/modules/services/databases/postgresql.nix 2010-06-13 20:59:49 UTC (rev 22247) @@ -28,9 +28,6 @@ postgresql = postgresqlAndPlugins pkgs.postgresql; - startDependency = if config.services.gw6c.enable then - "gw6c" else "network-interfaces"; - run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres"; flags = optional cfg.enableTCPIP "-i"; @@ -120,10 +117,10 @@ default = []; example = "pkgs.postgis"; # of course don't use a string here! description = '' - When this list contains elemnts a new store path is created. - Postgresql and the elments are symlinked into it. Then pg_config, + When this list contains elements a new store path is created. + PostgreSQL and the elments are symlinked into it. Then pg_config, postgres and pc_ctl are copied to make them use the new - $out/lib directory as pkglibdir. This make it possible to use postgis + $out/lib directory as pkglibdir. This makes it possible to use postgis without patching the .sql files which reference $libdir/postgis-1.5. ''; # Note: the duplication of executables is about 4MB size. @@ -160,7 +157,7 @@ jobs.postgresql = { description = "PostgreSQL server"; - startOn = "started ${startDependency}"; + startOn = "filesystem"; environment = { TZ = config.time.timeZone; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
