public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Virtual hosts: inherit adminAddr from the main server. 

svn path=/nixos/trunk/; revision=10756
This commit is contained in:
Eelco Dolstra 2008-02-19 14:54:19 +00:00
parent d7dd9179ce
commit a2c20a9d29
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
upstart-jobs/apache-httpd/default.nix
View File

@ -4,6 +4,8 @@ let
cfg = config.services.httpd; cfg = config.services.httpd;
mainCfg = cfg;
startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces"; startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces";
httpd = pkgs.apacheHttpd; httpd = pkgs.apacheHttpd;
@ -16,6 +18,11 @@ let
canonicalName = canonicalName =
"http://${cfg.hostName}" + "http://${cfg.hostName}" +
(if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else ""); (if cfg.httpPort != 80 then ":${toString cfg.httpPort}" else "");
# Admin address: inherit from the main server if not specified for
# a virtual host.
adminAddr = if cfg.adminAddr != "" then cfg.adminAddr else mainCfg.adminAddr;
serverConfig = cfg; serverConfig = cfg;
fullConfig = config; # machine config fullConfig = config; # machine config
}; };

2
upstart-jobs/apache-httpd/subversion.nix
View File

@ -13,7 +13,7 @@ let
logDir = "${config.dataDir}/log"; logDir = "${config.dataDir}/log";
postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook"; postCommitHook = "/var/run/current-system/sw/bin/svn-server-post-commit-hook";
fsType = "fsfs"; fsType = "fsfs";
adminAddr = serverInfo.serverConfig.adminAddr; adminAddr = serverInfo.adminAddr;