movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

many daemons: depend on all-interfaces instead of gw6c

Browse source 
svn path=/nixos/trunk/; revision=32766
This commit is contained in:
Mathijs Kwik 2012-03-04 12:58:18 +00:00
parent ce83d3580e
commit 86bf5566fe
9 changed files with 13 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/services/web-servers/apache-httpd/default.nix
View file

@ -6,8 +6,6 @@ let
mainCfg = config.services.httpd;
startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
httpd = pkgs.apacheHttpd;
getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
@ -555,7 +553,7 @@ in
description = "Apache HTTPD";
startOn = "started ${startingDependency} and filesystem"
startOn = "started all-interfaces 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