movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

nginx: disallow alias directive on server level; it doesn't work.

Browse source
This commit is contained in:
Evan Danaher 2017-03-09 16:54:44 -05:00
parent e7358b192a
commit a09246948c
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -158,7 +158,6 @@ let
server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
${acmeLocation}
${optionalString (vhost.root != null) "root ${vhost.root};"}
${optionalString (vhost.alias != null) "alias ${vhost.alias};"}
${optionalString (vhost.globalRedirect != null) ''
return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
''}
@ -380,10 +379,8 @@ in
config = mkIf cfg.enable {
# TODO: test user supplied config file pases syntax test
assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ {
assertion = all hostOrAliasIsNull (attrValues virtualHosts);
message = "Only one of nginx root or alias can be specified on a virtualHost.";
} {
assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [
{
assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
message = "Only one of nginx root or alias can be specified on a location.";
}