Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l 3 *_nginx: remove obsolete ssl option

Browse Source
This commit is contained in:
lassulus 2016-03-19 22:03:40 +01:00
parent 658594cae2
commit 9494b7233e
2 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lass/3modules/owncloud_nginx.nix
View File

@ -45,24 +45,6 @@ let
instanceid = mkOption { instanceid = mkOption {
type = str; 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 = {}; default = {};
@ -72,7 +54,7 @@ let
group = config.services.nginx.group; group = config.services.nginx.group;
imp = { imp = {
krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: { krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ... }: {
server-names = [ server-names = [
"${domain}" "${domain}"
"www.${domain}" "www.${domain}"
@ -116,16 +98,7 @@ let
error_page 403 /core/templates/403.php; error_page 403 /core/templates/403.php;
error_page 404 /core/templates/404.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, ... }: '' services.phpfpm.poolConfigs = flip mapAttrs cfg (name: { domain, folder, ... }: ''
listen = ${folder}/phpfpm.pool listen = ${folder}/phpfpm.pool

15
lass/3modules/static_nginx.nix
View File

@ -42,10 +42,6 @@ let
certificate_key = mkOption { certificate_key = mkOption {
type = str; type = str;
}; };
ciphers = mkOption {
type = str;
default = "AES128+EECDH:AES128+EDH";
};
}; };
}); });
default = {}; default = {};
@ -74,16 +70,7 @@ let
deny all; deny all;
'') '')
]; ];
inherit ssl;
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 "");
}); });
}; };