From a566adc5b24edca6ad16e414d2a09d074149e5ac Mon Sep 17 00:00:00 2001 From: Dan Dascalescu Date: Sat, 16 Jan 2016 18:08:27 -0800 Subject: [PATCH] Include backups among items uploadable to s3 Enabling S3 backups comes with a warning "requires valid S3 credentials entered in Files settings". This commit amends the description of s3_access_key_id to confirm it's the correct location for backup as well as image uploads to S3. --- config/locales/server.sq.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 168a8734711..efb40284ab2 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -776,9 +776,9 @@ sq: enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)." s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.' s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores." - s3_access_key_id: "The Amazon S3 access key id that will be used to upload images." - s3_secret_access_key: "The Amazon S3 secret access key that will be used to upload images." - s3_region: "The Amazon S3 region name that will be used to upload images." + s3_access_key_id: "The Amazon S3 access key id that will be used to upload images and/or backups." + s3_secret_access_key: "The Amazon S3 secret access key that will be used for uploading." + s3_region: "The Amazon S3 region name that will be used for uploading." s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts." avatar_sizes: "List of automatically generated avatar sizes." enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."