colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nextcloud: Make objectstore.s3.useSsl explicitly true by default

Browse Source 
This appears to match the nextcloud default behaviour observed here:

e2116e2fb2/lib/private/Files/ObjectStore/S3ConnectionTrait.php (L83)
This commit is contained in:
mitchmindtree 2021-10-03 13:50:25 +10:00
parent b23d6a4113
commit fbffaddefe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -368,8 +368,8 @@ in {
''; '';
}; };
useSsl = mkOption { useSsl = mkOption {
type = types.nullOr types.bool; type = types.bool;
default = null; default = true;
description = '' description = ''
Use SSL for objectstore access. Use SSL for objectstore access.
''; '';
@ -573,7 +573,7 @@ in {
'secret' => nix_read_secret('${s3.secretFile}'), 'secret' => nix_read_secret('${s3.secretFile}'),
${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"} ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"}
${optionalString (s3.port != null) "'port' => ${toString s3.port},"} ${optionalString (s3.port != null) "'port' => ${toString s3.port},"}
${optionalString (s3.useSsl != null) "'use_ssl' => ${boolToString s3.useSsl},"} 'use_ssl' => ${boolToString s3.useSsl},
${optionalString (s3.region != null) "'region' => '${s3.region}',"} ${optionalString (s3.region != null) "'region' => '${s3.region}',"}
'use_path_style' => ${boolToString s3.usePathStyle}, 'use_path_style' => ${boolToString s3.usePathStyle},
], ],