diff options
author | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
---|---|---|
committer | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
commit | 64aa4f6912fb7425d8063e5d143f59c43fb31b8f (patch) | |
tree | 07fe7c386d32bd5e1375a7d01f623cd357a1d09d /lass/3modules/static_nginx.nix | |
parent | 3f77b6c89f4a3a28d62e9117712481489ac56fa1 (diff) | |
parent | 6f4bc4b34c3cbac56f6a23740dca566980823990 (diff) |
Merge branch 'master' of gum:stockholm
Diffstat (limited to 'lass/3modules/static_nginx.nix')
-rw-r--r-- | lass/3modules/static_nginx.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix index 93441cf0d..6e87e9853 100644 --- a/lass/3modules/static_nginx.nix +++ b/lass/3modules/static_nginx.nix @@ -42,10 +42,6 @@ let certificate_key = mkOption { type = str; }; - ciphers = mkOption { - type = str; - default = "AES128+EECDH:AES128+EDH"; - }; }; }); default = {}; @@ -74,16 +70,7 @@ let deny all; '') ]; - - listen = (if ssl.enable then - [ "80" "443 ssl" ] - else - "80" - ); - extraConfig = (if ssl.enable then '' - ssl_certificate ${ssl.certificate}; - ssl_certificate_key ${ssl.certificate_key}; - '' else ""); + inherit ssl; }); }; |