Julien Malka
d05fcb7e2c
Some checks failed
Check meta / check_dns (push) Failing after 19s
Check meta / check_meta (push) Successful in 20s
build configuration / build_and_cache_storage01 (push) Failing after 35s
build configuration / build_and_cache_compute01 (push) Failing after 36s
build configuration / build_and_cache_rescue01 (push) Failing after 33s
build configuration / build_and_cache_geo01 (push) Failing after 32s
build configuration / build_and_cache_geo02 (push) Failing after 31s
build configuration / build_and_cache_vault01 (push) Failing after 33s
build configuration / build_and_cache_web01 (push) Failing after 32s
build configuration / build_and_cache_web02 (push) Failing after 33s
lint / check (push) Failing after 28s
build configuration / build_and_cache_krz01 (push) Failing after 1m55s
build configuration / build_and_cache_bridge01 (push) Failing after 33s
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
--- a/nixos/modules/services/web-apps/nextcloud.nix
|
|
+++ b/nixos/modules/services/web-apps/nextcloud.nix
|
|
@@ -131,6 +131,7 @@
|
|
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
|
|
Use services.nextcloud.enableImagemagick instead.
|
|
'')
|
|
+ (mkRenamedOptionModule [ "services" "nextcloud" "config" "objectstore" "s3" "autocreate" ] [ "services" "nextcloud" "config" "objectstore" "s3" "verify_bucket_exists" ])
|
|
];
|
|
|
|
options.services.nextcloud = {
|
|
@@ -487,7 +487,7 @@
|
|
The name of the S3 bucket.
|
|
'';
|
|
};
|
|
- autocreate = mkOption {
|
|
+ verify_bucket_exists = mkOption {
|
|
type = types.bool;
|
|
description = lib.mdDoc ''
|
|
Create the objectstore if it does not exist.
|
|
@@ -820,7 +820,7 @@
|
|
'class' => '\\OC\\Files\\ObjectStore\\S3',
|
|
'arguments' => [
|
|
'bucket' => '${s3.bucket}',
|
|
- 'autocreate' => ${boolToString s3.autocreate},
|
|
+ 'verify_bucket_exists' => ${boolToString s3.verify_bucket_exists},
|
|
'key' => '${s3.key}',
|
|
'secret' => nix_read_secret('${s3.secretFile}'),
|
|
${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"}
|