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

Automatic update

Author: khalima

Makefile

@@ -1,5 +1,6 @@
 PHONY :=
 PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+IS_CONTAINER := $(shell test ${CONTAINER_RUNNING} && echo true || echo false)
 
 # Colors
 NO_COLOR=\033[0m

composer.lock

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor5
 _core:
-  default_config_hash: oCDUwt4GjXQJeBCiJlq5NKEU0d9JP2Kx3QZKMuDAi_g
+  default_config_hash: i1fLaAzni2rKBDARlCWA1xa79zo_RYF-8oQ3x9wxgfM
 format: full_html
 editor: ckeditor5
 settings:
@@ -151,6 +151,11 @@ settings:
           weight: 19
           search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
           replace: $1
+        -
+          enabled: true
+          weight: 20
+          search: '&nbsp;'
+          replace: ' '
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<figure tabindex>'

conf/cmi/editor.editor.full_html.yml

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor5
 _core:
-  default_config_hash: 5XykmWxByyrIQ2N9_zHqVQlMtBUy9wc5P9lPrM_g7oQ
+  default_config_hash: oE8ZPS7LMQvOJv0JDM2AJcGyPAti79fl6vzr3v-GWM0
 format: minimal
 editor: ckeditor5
 settings:
@@ -133,6 +133,11 @@ settings:
           weight: 19
           search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
           replace: $1
+        -
+          enabled: true
+          weight: 20
+          search: '&nbsp;'
+          replace: ' '
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<p data-chat-trigger>'

conf/cmi/editor.editor.minimal.yml

@@ -10,12 +10,33 @@ id: tunnistamo
 label: Tunnistamo
 plugin: tunnistamo
 settings:
-  client_id: placeholder
-  client_secret: placeholder
+  client_id: ''
+  client_secret: ''
   iss_allowed_domains: ''
-  is_production: 0
+  prompt:
+    login: login
   auto_login: 0
-  environment_url: 'https://tunnistamo.test.hel.ninja'
+  environment_url: ''
   client_scopes: 'openid,email'
   client_roles: {  }
-  debug_log: false
+  ad_roles:
+    -
+      ad_role: Drupal_Helfi_kaupunkitaso_paakayttajat
+      roles:
+        - admin
+    -
+      ad_role: Drupal_Helfi_Tyo_ja_yrittäminen_sisallontuottajat_laaja
+      roles:
+        - editor
+    -
+      ad_role: Drupal_Helfi_Tyo_ja_yrittäminen_sisallontuottajat_suppea
+      roles:
+        - content_producer
+    -
+      ad_role: Drupal_Helfi_Etusivu_kayttajakyselyt
+      roles:
+        - survey_editor
+    -
+      ad_role: 947058f4-697e-41bb-baf5-f69b49e5579a
+      roles:
+        - super_administrator

conf/cmi/openid_connect.client.tunnistamo.yml

@@ -2,7 +2,7 @@
 
 while true
 do
-  echo "Running cron: $(date +'%Y-%m-%dT%H:%M:%S%:z')\n"
+  echo "Running cron: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
   drush cron
   # Sleep for 10 minutes.
   sleep 600

docker/openshift/crons/cron.sh

@@ -7,3 +7,5 @@ fi
 
 # Obfuscate user data
 drush sql:sanitize
+# Convert file schemes for Stage file proxy
+drush sql-query "UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');"

docker/openshift/hooks/db-replace/50-sanitize.sh

@@ -385,7 +385,10 @@ function drupal_get_env(string|array $variables) : mixed {
   // Always default to blob storage if configured.
   if ($blob_storage_container = getenv('AZURE_BLOB_STORAGE_CONTAINER')) {
     $stage_file_proxy_origin = 'https://stplattaprod.blob.core.windows.net';
-    $stage_file_proxy_dir = $blob_storage_container;
+    // The container name uses the same naming convention across environments.
+    // Make sure the container name also points to production.
+    // For example: 'etusivu64e62test' -> 'etusivu64e62prod'.
+    $stage_file_proxy_dir = str_replace(['test', 'staging'], 'prod', $blob_storage_container);
   }
   $config['stage_file_proxy.settings']['origin'] = $stage_file_proxy_origin;
   $config['stage_file_proxy.settings']['origin_dir'] = $stage_file_proxy_dir;

public/sites/default/settings.php

@@ -126,6 +126,12 @@ open-db-gui: ## Open database with GUI tool
 	$(eval DB_PASS ?= drupal)
 	@open mysql://$(DB_USER):$(DB_PASS)@$(shell docker compose port $(DB_SERVICE) 3306 | grep -v ::)/$(DB_NAME)
 
+ifeq ($(IS_CONTAINER),false)
 define drush
 	$(call docker_compose_exec,drush $(1),$(2))
 endef
+else
+define drush
+	@drush $(1) $(2)
+endef
+endif