summaryrefslogtreecommitdiffstats
path: root/lass/3modules/owncloud_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/owncloud_nginx.nix
parent90ef4d08a13c24456f98d0aab6b55b8c16c89d0b (diff)
parentfda0262111283afa198510730af8c251886abd4a (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/3modules/owncloud_nginx.nix')
-rw-r--r--lass/3modules/owncloud_nginx.nix29
1 files changed, 1 insertions, 28 deletions
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index a10df779e..35d8d04a5 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -45,24 +45,6 @@ let
instanceid = mkOption {
type = str;
};
- ssl = mkOption {
- 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 = {};
- };
};
}));
default = {};
@@ -72,7 +54,7 @@ let
group = config.services.nginx.group;
imp = {
- krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: {
+ krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ... }: {
server-names = [
"${domain}"
"www.${domain}"
@@ -116,16 +98,7 @@ 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