diff options
author | makefu <github@syntax-fehler.de> | 2015-10-19 20:46:08 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-19 20:46:08 +0200 |
commit | bb2c33cf309c5c789de14516137746cfa3bc3a70 (patch) | |
tree | a149d548315ae32849c73731fd7368bf1568aaa5 | |
parent | aed6c87e7ac4fb46f4029208d8938ba0fa869491 (diff) | |
parent | dc52c4b988ba1e64bf91567f06b89586ca92fa47 (diff) |
Merge remote-tracking branch 'cd/master'
-rw-r--r-- | krebs/3modules/nginx.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix index 65f3b238e..c5f38c271 100644 --- a/krebs/3modules/nginx.nix +++ b/krebs/3modules/nginx.nix @@ -24,9 +24,9 @@ let "${config.networking.hostName}.retiolum" ]; }; - port = mkOption { - type = with types; int; - default = 80; + listen = mkOption { + type = with types; str; + default = "80"; }; locations = mkOption { type = with types; listOf (attrsOf str); @@ -68,9 +68,9 @@ let } ''; - to-server = { server-names, port, locations, extraConfig, ... }: '' + to-server = { server-names, listen, locations, extraConfig, ... }: '' server { - listen ${toString port}; + listen ${listen}; server_name ${toString server-names}; ${extraConfig} ${indent (concatStrings (map to-location locations))} |