summaryrefslogtreecommitdiffstats
path: root/lass/3modules/static_nginx.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-03-20 00:03:52 +0100
committermakefu <github@syntax-fehler.de>2016-03-20 00:03:52 +0100
commita8c76186998c6ae0c10f948aef6a32567871ae44 (patch)
tree678a1d5019392418fb67d69b0363bf1c450898d9 /lass/3modules/static_nginx.nix
parent90ef4d08a13c24456f98d0aab6b55b8c16c89d0b (diff)
parentfda0262111283afa198510730af8c251886abd4a (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/3modules/static_nginx.nix')
-rw-r--r--lass/3modules/static_nginx.nix15
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;
});
};