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

* Allow aliases for each virtual host.

Browse Source 
svn path=/nixos/trunk/; revision=10754
This commit is contained in:
Eelco Dolstra 2008-02-19 14:41:20 +00:00
parent 5122633592
commit d7dd9179ce
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,8 @@ let
in '' in ''
ServerName ${serverInfo.canonicalName} ServerName ${serverInfo.canonicalName}
${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
${if isMainServer || cfg.adminAddr != "" then '' ${if isMainServer || cfg.adminAddr != "" then ''
ServerAdmin ${cfg.adminAddr} ServerAdmin ${cfg.adminAddr}
'' else ""} '' else ""}

8
upstart-jobs/apache-httpd/per-server-options.nix
View File

@ -14,6 +14,14 @@
"; ";
}; };
serverAliases = mkOption {
default = [];
example = ["www.example.org" "www.example.org:8080" "example.org"];
description = "
Additional names of virtual hosts served by this virtual host configuration.
";
};
httpPort = mkOption { httpPort = mkOption {
default = 80; default = 80;
description = " description = "