Merge pull request #364 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Oct 28, 2022 · 393ad9a · 393ad9a
2 parents 16e56a0 + b33d9bd
commit 393ad9a
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 58 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/imagecache_external.settings.yml b/conf/cmi/imagecache_external.settings.yml
@@ -1,11 +1,12 @@
 _core:
   default_config_hash: sYKKIgXKwriRVKA1-QEKqToS8jwnr-TasvZwHT0Asek
 imagecache_directory: externals
+imagecache_subdirectories: false
 imagecache_default_extension: .jpg
 imagecache_external_batch_flush_limit: 1000
 imagecache_external_hosts: ''
 imagecache_external_management: unmanaged
-imagecache_external_use_whitelist: 1
+imagecache_external_use_whitelist: true
 imagecache_fallback_image: 0
 imagecache_external_allowed_mimetypes:
   - image/jpg
@@ -21,5 +22,6 @@ imagecache_external_allowed_mimetypes:
   - binary/octet-stream
   - image/webp
   - image/webp;charset=utf-8
+  - image/webp
+  - image/webp;charset=utf-8
 imagecache_external_cron_flush_frequency: 0
-imagecache_subdirectories: false
diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml
@@ -3,6 +3,7 @@ _core:
 always_save_userinfo: true
 connect_existing_users: true
 override_registration_settings: true
+end_session_enabled: true
 user_login_display: above
 userinfo_mappings:
   timezone: zoneinfo

diff --git a/docker/openshift/crons/content-scheduler.sh b/docker/openshift/crons/content-scheduler.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "Running content-scheduler"
-
 while true
 do
   drush scheduler:cron -q

diff --git a/docker/openshift/crons/drupal.sh b/docker/openshift/crons/drupal.sh
diff --git a/docker/openshift/crons/migrate-tpr.sh b/docker/openshift/crons/migrate-tpr.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "Running TPR Migrations: $(date)"
-
 function populate_variables {
   # Generate variables used to control which migrates needs
   # to be reset and which ones needs to be skipped based on
@@ -46,19 +44,19 @@ do
 
   if run_migrate "tpr_unit"; then
     echo "Running TPR Unit migrate: $(date)"
-    PARTIAL_MIGRATE=1 drush migrate:import tpr_unit
+    PARTIAL_MIGRATE=1 drush migrate:import tpr_unit --no-progress
   fi
   if run_migrate "tpr_service"; then
     echo "Running TPR Service migrate: $(date)"
-    PARTIAL_MIGRATE=1 drush migrate:import tpr_service
+    PARTIAL_MIGRATE=1 drush migrate:import tpr_service --no-progress
   fi
   if run_migrate "tpr_errand_service"; then
     echo "Running TPR Errand Service migrate: $(date)"
-    PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service
+    PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service --no-progress
   fi
   if run_migrate "tpr_service_channel"; then
     echo "Running TPR Service Channel migrate: $(date)"
-    PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel
+    PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel --no-progress
   fi
   # Reset migrate status if migrate has been running for more
   # than 12 hours.

diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "Running purge queue: $(date)"
-
 function has_items {
   NUM_ITEMS=$(drush p:queue-stats --format=json | jq .number_of_items)
 
@@ -14,8 +12,7 @@ function has_items {
 while true
 do
   if has_items; then
-    echo "Flushing purge queue: $(date)"
-    drush p:queue-work --no-interaction -q --finish
+    drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}'
   fi
   # Sleep for 60 seconds.
   sleep 60