Merge pull request #82 from SmdhMdep/file-size-limit-2

Changes DP image used and some confgurations to support increased file size resources
SmdhMdep · Jul 7, 2023 · 411c6bf · 411c6bf
2 parents 9ccfbf0 + d104576
commit 411c6bf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/contrib/docker-ckan/base/setup/start_ckan.sh b/contrib/docker-ckan/base/setup/start_ckan.sh
@@ -55,8 +55,8 @@ UWSGI_OPTS="--plugins http,python \
 echo "Enabling ckan tracking"
 ckan config-tool $CKAN_INI "ckan.tracking_enabled = true"
 
-# echo "Loading Datapusher+ settings into ckan.ini"
-# ckan config-tool $CKAN_INI "ckan.datapusher.formats = csv xls xlsx xlsm xlsb tsv tab application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet"
+echo "Loading Datapusher+ settings into ckan.ini"
+ckan config-tool $CKAN_INI "ckan.datapusher.formats = csv xls xlsx xlsm xlsb tsv tab application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet"
 
 echo "Loading default views into ckan.ini"
 ckan config-tool $CKAN_INI "ckan.views.default_views = image_view text_view recline_view pdf_view"

diff --git a/contrib/docker-ckan/dev-base/setup/start_ckan_development.sh b/contrib/docker-ckan/dev-base/setup/start_ckan_development.sh
@@ -67,6 +67,12 @@ ckan config-tool $CKAN_INI "who.timeout = $CKAN_SESSION_TIMEOUT"
 echo "Loading the following plugins: $CKAN__PLUGINS"
 ckan config-tool $CKAN_INI "ckan.plugins = $CKAN__PLUGINS"
 
+echo "Loading Datapusher+ settings into ckan.ini"
+ckan config-tool $CKAN_INI "ckan.datapusher.formats = csv xls xlsx xlsm xlsb tsv tab application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet"
+
+echo "Loading default views into ckan.ini"
+ckan config-tool $CKAN_INI "ckan.views.default_views = image_view text_view recline_view pdf_view"
+
 # Update test-core.ini DB, SOLR & Redis settings
 echo "Loading test settings into test-core.ini"
 ckan config-tool $SRC_DIR/ckan/test-core.ini \

diff --git a/contrib/docker-ckan/dev.env.template b/contrib/docker-ckan/dev.env.template
@@ -42,6 +42,8 @@ CKAN_SMTP_USER=user
 CKAN_SMTP_PASSWORD=pass
 CKAN_SMTP_MAIL_FROM=ckan@localhost
 TZ=UTC
+CKAN_MAX_UPLOAD_SIZE_MB=300
+CKAN_MAX_RESOURCE_SIZE_MB=300
 # 12 hours in seconds
 CKAN_SESSION_TIMEOUT=43200
 

diff --git a/contrib/docker-ckan/docker-compose.dev.yml b/contrib/docker-ckan/docker-compose.dev.yml
@@ -36,7 +36,7 @@ services:
 
   datapusher:
     container_name: ${DATAPUSHER_CONTAINER_NAME}
-    image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
+    image: ${INTERNAL_REG}/mdepckan/ckan-datapusher:latest
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]

diff --git a/contrib/docker-ckan/docker-compose.prod.yml b/contrib/docker-ckan/docker-compose.prod.yml
@@ -14,16 +14,4 @@ x-aws-cloudformation:
         Protocol: HTTPS
         Port: 443
       Type: AWS::ElasticLoadBalancingV2::Listener
-    # create our own LB side security group for the ckan_internal network
-    # which we attach to the ALB (manually) - all this will be done automatically in the future with udpates to compose-cli hopefully
-    # see https://github.com/docker/compose-cli/pull/2215
-    CkanLB:
-      Properties:
-        GroupDescription: Security group for ckan-LB comm
-        Tags:
-          - Key: com.docker.compose.project
-            Value: docker-ckan
-          - Key: com.docker.compose.network
-            Value: docker-ckan_ckan-internal
-      Type: AWS::EC2::SecurityGroup
 
diff --git a/contrib/docker-ckan/docker-compose.yml b/contrib/docker-ckan/docker-compose.yml
@@ -54,7 +54,7 @@ services:
 
   datapusher:
     container_name: ${DATAPUSHER_CONTAINER_NAME}
-    image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
+    image: ${INTERNAL_REG}/mdepckan/ckan-datapusher:latest
     deploy:
       update_config:
         x-aws-min_percent: 50

diff --git a/contrib/docker-ckan/nginx/setup/default.conf b/contrib/docker-ckan/nginx/setup/default.conf
@@ -6,6 +6,7 @@ server {
     server_name stagingmdep.smdh.uk;
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
     client_max_body_size 300M;
+    client_body_buffer_size 50M;
     # return 301 https://$host$request_uri;
     # ssl_certificate /etc/nginx/certs/ckan-local.crt;
     # ssl_certificate_key /etc/nginx/certs/ckan-local.key;

diff --git a/contrib/docker-ckan/prod.env.template b/contrib/docker-ckan/prod.env.template
@@ -45,8 +45,8 @@ CKAN_SMTP_MAIL_FROM=${CKAN_SMTP_USER}
 CKAN_SMTP_REPLY_TO=${CKAN_SMTP_USER}
 TZ=UTC
 UWSGI_HARAKIRI=90
-CKAN_MAX_UPLOAD_SIZE_MB=50
-CKAN_MAX_RESOURCE_SIZE_MB=50
+CKAN_MAX_UPLOAD_SIZE_MB=300
+CKAN_MAX_RESOURCE_SIZE_MB=300
 # 12 hours in seconds
 CKAN_SESSION_TIMEOUT=43200