diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-11 21:31:15 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-11 21:31:15 +0100 |
| commit | 014cbb7598c5d45cfc4cc7e1ec81c92e000eabfb (patch) | |
| tree | fab0e894948010cd73be18ad2c68cd4750bd2419 /lass/3modules/owncloud_nginx.nix | |
| parent | 8ecdb889dd3081ba29c6ea7eb35f60b30420d201 (diff) | |
| parent | 7b3b839cc7a2af73dee9858e6ebcc7be831eb481 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/3modules/owncloud_nginx.nix')
| -rw-r--r-- | lass/3modules/owncloud_nginx.nix | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix index 0cb11846c..79c9de1d4 100644 --- a/lass/3modules/owncloud_nginx.nix +++ b/lass/3modules/owncloud_nginx.nix @@ -46,8 +46,22 @@ let type = str; }; ssl = mkOption { - type = bool; - default = false; + type = with types; submodule ({ + options = { + enable = mkEnableOption "ssl"; + certificate = mkOption { + type = str; + }; + certificate_key = mkOption { + type = str; + }; + ciphers = mkOption { + type = str; + default = "AES128+EECDH:AES128+EDH"; + }; + }; + }); + default = {}; }; }; })); @@ -58,7 +72,7 @@ let group = config.services.nginx.group; imp = { - krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ... }: { + krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: { server-names = [ "${domain}" "www.${domain}" @@ -102,7 +116,16 @@ let error_page 403 /core/templates/403.php; error_page 404 /core/templates/404.php; + ${if ssl.enable then '' + ssl_certificate ${ssl.certificate}; + ssl_certificate_key ${ssl.certificate_key}; + '' else ""} ''; + listen = (if ssl.enable then + [ "80" "443 ssl" ] + else + "80" + ); }); services.phpfpm.poolConfigs = flip mapAttrs cfg (name: { domain, folder, ... }: '' listen = ${folder}/phpfpm.pool |