Merge pull request #2840 from edx/jsa/fix-s3-custom-domain

credentials: correct AWS_S3_CUSTOM_DOMAIN setting

playbooks/roles/credentials/defaults/main.yml

@@ -87,6 +87,9 @@ CREDENTIALS_STATIC_URL: '/static/'
 # Example settings to use Amazon S3 as a storage backend with django storages:
 # https://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#amazon-s3
 #
+# Note, AWS_S3_CUSTOM_DOMAIN is required, otherwise boto will generate non-working
+# querystring URLs for assets (see https://github.com/boto/boto/issues/1477)
+#
 # CREDENTIALS_BUCKET: mybucket
 # credentials_s3_domain: s3.amazonaws.com
 # CREDENTIALS_MEDIA_ROOT: 'media'
@@ -94,7 +97,7 @@ CREDENTIALS_STATIC_URL: '/static/'
 #
 # CREDENTIALS_FILE_STORAGE_BACKEND:
 #  AWS_STORAGE_BUCKET_NAME: '{{ CREDENTIALS_BUCKET }}'
-#  AWS_CUSTOM_DOMAIN: '{{ CREDENTIALS_BUCKET }}.{{ credentials_s3_domain }}'
+#  AWS_S3_CUSTOM_DOMAIN: '{{ CREDENTIALS_BUCKET }}.{{ credentials_s3_domain }}'
 #  AWS_ACCESS_KEY_ID: 'XXXAWS_ACCESS_KEYXXX'
 #  AWS_SECRET_ACCESS_KEY: 'XXXAWS_SECRET_KEYXXX'
 #  AWS_QUERYSTRING_AUTH: False