nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 02:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependencies of Apache and PostgreSQL

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-14 18:15:37 -04:00
parent a133eb5991
commit c2b2a3369a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/services/databases/postgresql.nix
View File

@ -153,7 +153,8 @@ in
jobs.postgresql =
{ description = "PostgreSQL server";
startOn = "started network-interfaces and filesystem";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "fs.target" ];
environment =
{ TZ = config.time.timeZone;

8
modules/services/web-servers/apache-httpd/default.nix
View File

@ -581,12 +581,8 @@ in
jobs.httpd =
{ description = "Apache HTTPD";
startOn = "started networking 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";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" "fs.target" "postgresql.service" ];
path =
[ httpd pkgs.coreutils pkgs.gnugrep ]