Unverified Commit 2cb444f4 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: nixos/nextcloud: S3: Rename autocreate (a no-op) to verify_bucket_exists (#399629)

parents 6545d4f5 08e859c8

nixos/modules/services/web-apps/nextcloud.nix

+8 −3
Original line number Diff line number Diff line
@@ -205,7 +205,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_secret'),

              ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"}
@@ -344,6 +344,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 = {
@@ -653,10 +657,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 {