44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From dbc114c35dbc279fcde483da805ca1b6d5f40b60 Mon Sep 17 00:00:00 2001
|
|
From: Tom Hubrecht <tom@hubrecht.ovh>
|
|
Date: Mon, 18 Dec 2023 10:40:16 +0100
|
|
Subject: [PATCH] nixos/nextcloud: Rename autocreate (a no-op) to
|
|
verify_bucket_exists
|
|
|
|
C.f. https://github.com/nextcloud/documentation/issues/10436
|
|
---
|
|
nixos/modules/services/web-apps/nextcloud.nix | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
|
|
index 7f998207c434aa..ba1e1bbe46756a 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,7 +572,7 @@ in {
|
|
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.
|