From 8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 22 Jul 2016 13:06:15 +0200 Subject: nginx: use host name and aliases as default server-names --- krebs/3modules/nginx.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'krebs/3modules/nginx.nix') diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix index fc7fcca6f..bc32da3b1 100644 --- a/krebs/3modules/nginx.nix +++ b/krebs/3modules/nginx.nix @@ -31,12 +31,10 @@ let options = { server-names = mkOption { type = with types; listOf str; - # TODO use identity - default = [ - "${config.networking.hostName}" - "${config.networking.hostName}.r" - "${config.networking.hostName}.retiolum" - ]; + default = + [config.krebs.build.host.name] ++ + concatMap (getAttr "aliases") + (attrValues config.krebs.build.host.nets); }; listen = mkOption { type = with types; either str (listOf str); -- cgit v1.2.3