movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 13:15:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

* PostgreSQL / MySQL: depend on the "filesystem" event.

Browse source 
svn path=/nixos/branches/boot-order/; revision=22247
This commit is contained in:
Eelco Dolstra 2010-06-13 20:59:49 +00:00
parent a5c433696c
commit 03f77ca82b
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/services/databases/mysql.nix
View file

@ -100,7 +100,7 @@ in
jobs.mysql = jobs.mysql =
{ description = "MySQL server"; { description = "MySQL server";
startOn = "started network-interfaces"; startOn = "filesystem";
preStart = preStart =
'' ''

11
modules/services/databases/postgresql.nix
View file

@ -28,9 +28,6 @@ let
postgresql = postgresqlAndPlugins pkgs.postgresql; 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"; run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
flags = optional cfg.enableTCPIP "-i"; flags = optional cfg.enableTCPIP "-i";
@ -120,10 +117,10 @@ in
default = []; default = [];
example = "pkgs.postgis"; # of course don't use a string here! example = "pkgs.postgis"; # of course don't use a string here!
description = '' description = ''
When this list contains elemnts a new store path is created. When this list contains elements a new store path is created.
Postgresql and the elments are symlinked into it. Then pg_config, PostgreSQL and the elments are symlinked into it. Then pg_config,
postgres and pc_ctl are copied to make them use the new 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. without patching the .sql files which reference $libdir/postgis-1.5.
''; '';
# Note: the duplication of executables is about 4MB size. # Note: the duplication of executables is about 4MB size.
@ -160,7 +157,7 @@ in
jobs.postgresql = jobs.postgresql =
{ description = "PostgreSQL server"; { description = "PostgreSQL server";
startOn = "started ${startDependency}"; startOn = "filesystem";
environment = environment =
{ TZ = config.time.timeZone; { TZ = config.time.timeZone;