summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hubrecht <tom@hubrecht.ovh>2023-12-18 10:40:16 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2025-04-22 14:04:22 +0000
commit4f2ffb6dc9e066a6167f5eb3134dcf1efe3fa5bd (patch)
tree42f04086e1d0e8b636efbea92e5cb71c97891cb7
parent[Backport release-24.11] firefox: do not set the executable bit on desktop fi... (diff)
downloadnixpkgs-origin/backport-399629-to-release-24.11.tar.gz
nixos/nextcloud: S3: Rename autocreate (a no-op) to verify_bucket_existsorigin/backport-399629-to-release-24.11
C.f. https://github.com/nextcloud/documentation/issues/10436 Co-authored-by: Tom Herbers <mail@tomherbers.de> Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com> (cherry picked from commit 08e859c8e01f4cda388a69c55f708c8fa4860d05)
-rw-r--r--nixos/modules/services/web-apps/nextcloud.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 3079a20c5176..c30755d32ab3 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -142,7 +142,7 @@ let
'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}',"}
@@ -277,6 +277,10 @@ in
[ "services" "nextcloud" "extraOptions" ]
[ "services" "nextcloud" "settings" ]
)
+ (mkRenamedOptionModule
+ [ "services" "nextcloud" "config" "objectstore" "s3" "autocreate" ]
+ [ "services" "nextcloud" "config" "objectstore" "s3" "verify_bucket_exists" ]
+ )
];
options.services.nextcloud = {
@@ -568,10 +572,11 @@ in
The name of the S3 bucket.
'';
};
- autocreate = mkOption {
+ verify_bucket_exists = mkOption {
type = types.bool;
+ default = true;
description = ''
- Create the objectstore if it does not exist.
+ Create the objectstore bucket if it does not exist.
'';
};
key = mkOption {