From f31ca316936b59897da0000558fe351ad53cfd94 Mon Sep 17 00:00:00 2001 From: Josh Richards Date: Sat, 10 Jun 2023 11:26:57 -0400 Subject: [PATCH] (primary+external storage) S3 bucket naming requirements Fixes nextcloud/server#35364 Also adds note about S3 endpoint naming to to External Storage make consistent with Primary Storage change made in #10595 Signed-off-by: Josh Richards --- .../configuration_files/external_storage/amazons3.rst | 5 ++--- admin_manual/configuration_files/primary_storage.rst | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_files/external_storage/amazons3.rst b/admin_manual/configuration_files/external_storage/amazons3.rst index a522aa827..b351672d9 100644 --- a/admin_manual/configuration_files/external_storage/amazons3.rst +++ b/admin_manual/configuration_files/external_storage/amazons3.rst @@ -7,8 +7,7 @@ To connect an Amazon S3 (or compatible) bucket to Nextcloud you will need to kno - S3 bucket name - S3 access key ID - S3 secret access key -- S3 region (if Amazon hosted) -- S3 hostname (if non-Amazon hosted) +- S3 region (if Amazon hosted) or S3 hostname (if non-Amazon hosted) [Note: If specifying a hostname, use the generic S3 endpoint hostname, **not** the hostname that contains your bucket name] In the **Folder name** field enter a folder name to use as the local mountpoint for this external storage. If this does not exist it will be created. @@ -17,7 +16,7 @@ In the **External storage** field select **Amazon S3**. In the **Authentication** field select **Access key**. -In the **Bucket** field enter your *S3 bucket name*. +In the **Bucket** field enter your *S3 bucket name*. [Note: Even if non-Amazon hosted, bucket names must meet AWS S3 naming requirements regardless of what your S3 provider/platform considers acceptable - i.e. no underscores] In the **Access key** field enter your *S3 access key ID*. diff --git a/admin_manual/configuration_files/primary_storage.rst b/admin_manual/configuration_files/primary_storage.rst index fe6bec5cd..ccd28dea1 100644 --- a/admin_manual/configuration_files/primary_storage.rst +++ b/admin_manual/configuration_files/primary_storage.rst @@ -166,7 +166,7 @@ Non-Amazon hosted S3: Minimum required parameters are: -* :code:`bucket` +* :code:`bucket` [Note: Even if non-Amazon hosted, bucket names must meet AWS S3 naming requirements regardless of what your S3 provider/platform considers acceptable - i.e. no underscores] * :code:`key` * :code:`secret`