diff --git a/cdk/lib/ckan-stack.ts b/cdk/lib/ckan-stack.ts index 5de99267f..6b324483b 100644 --- a/cdk/lib/ckan-stack.ts +++ b/cdk/lib/ckan-stack.ts @@ -375,8 +375,7 @@ export class CkanStack extends Stack { ckanContainerEnv['CKAN_CLOUDSTORAGE_ENABLED'] = 'true'; ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER'] = pCkanCloudstorageDriver.stringValue; ckanContainerEnv['CKAN_CLOUDSTORAGE_CONTAINER_NAME'] = pCkanCloudstorageContainerName.stringValue; - ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = pCkanCloudstorageUseSecureUrls.stringValue; - ckanContainerEnv['CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS'] = '1'; + ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = 'true' ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER_OPTIONS'] = ''; ckanTaskPolicyAllowCloudstorage = new iam.PolicyStatement({ @@ -393,8 +392,7 @@ export class CkanStack extends Stack { ckanContainerEnv['CKAN_CLOUDSTORAGE_ENABLED'] = 'false'; ckanContainerEnv['CKAN_CLOUDSTORAGE_DRIVER'] = ''; ckanContainerEnv['CKAN_CLOUDSTORAGE_CONTAINER_NAME'] = ''; - ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = ''; - ckanContainerEnv['CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS'] = '0'; + ckanContainerEnv['CKAN_CLOUDSTORAGE_USE_SECURE_URLS'] = 'false'; } const ckanLogGroup = new logs.LogGroup(this, 'ckanLogGroup', { diff --git a/ckan/ckanext/ckanext-cloudstorage b/ckan/ckanext/ckanext-cloudstorage index d34f9da0c..5f53f07bc 160000 --- a/ckan/ckanext/ckanext-cloudstorage +++ b/ckan/ckanext/ckanext-cloudstorage @@ -1 +1 @@ -Subproject commit d34f9da0c9dd4f2e09c1bdf8d15770cbaf5b334b +Subproject commit 5f53f07bc28556f7140b5eaf2e75d2e2178ffe8e diff --git a/ckan/templates/production.ini.j2 b/ckan/templates/production.ini.j2 index be5427dfc..e359113e4 100644 --- a/ckan/templates/production.ini.j2 +++ b/ckan/templates/production.ini.j2 @@ -204,7 +204,6 @@ ckanext.reminder.email_field = maintainer_email ckanext.cloudstorage.driver = {{ environ('CKAN_CLOUDSTORAGE_DRIVER') }} ckanext.cloudstorage.container_name = {{ environ('CKAN_CLOUDSTORAGE_CONTAINER_NAME') }} ckanext.cloudstorage.use_secure_urls = {{ environ('CKAN_CLOUDSTORAGE_USE_SECURE_URLS') }} -ckanext.cloudstorage.aws_use_boto3_sessions = {{ environ('CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS') }} ckanext.cloudstorage.driver_options = {{ environ('CKAN_CLOUDSTORAGE_DRIVER_OPTIONS') }} ckanext.cloudstorage.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet ckan.datapusher.formats = nonexistingformat diff --git a/docker/.env.ckan.local b/docker/.env.ckan.local index acffd777b..f08f8798e 100644 --- a/docker/.env.ckan.local +++ b/docker/.env.ckan.local @@ -28,8 +28,7 @@ CKAN_CLOUDSTORAGE_ENABLED=false CKAN_CLOUDSTORAGE_DRIVER="S3_EU_WEST" CKAN_CLOUDSTORAGE_DRIVER_OPTIONS="" CKAN_CLOUDSTORAGE_CONTAINER_NAME="" -CKAN_CLOUDSTORAGE_USE_SECURE_URLS=1 -CKAN_CLOUDSTORAGE_AWS_USE_BOTO3_SESSIONS=1 +CKAN_CLOUDSTORAGE_USE_SECURE_URLS=true AWS_ACCESS_KEY_ID="" AWS_SECRET_ACCESS_KEY="" ZULIP_API_URL=