City-of-Helsinki · rpnykanen · Dec 21, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
diff --git a/composer.json b/composer.json
@@ -56,6 +56,9 @@
         "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
+        "drupal/core": ">=10.2",
+        "drupal/core-composer-scaffold": ">=10.2",
+        "drupal/core-dev": ">=10.2",
         "drupal/drupal": "*"
     },
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
@@ -6,6 +6,7 @@ ignored_config_entities:
   - block.block.ibmchatapp_neuvonta_fi
   - block.block.ibmchatapp_neuvonta_sv
   - easy_breadcrumb.settings
+  - 'easy_breadcrumb.settings:home_segment_title'
   - 'hdbt_admin_tools.site_settings:footer_settings'
   - 'hdbt_admin_tools.site_settings:site_settings'
   - 'system.site:page.front'
diff --git a/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -21,7 +21,7 @@ dependencies:
     module:
       - helfi_base_content
 _core:
-  default_config_hash: l2_rEPVNbUKnMXqnX9O0LUsP6KCnX2EmDDPXfXKoPQ8
+  default_config_hash: _Nbhr4JLQXcrcmDFzHXgntvTpv2ZLX_zza-h7gjrYws
 id: paragraphs_library_item.paragraphs_library_item.paragraphs
 field_name: paragraphs
 entity_type: paragraphs_library_item

diff --git a/conf/cmi/file_mdm.settings.yml b/conf/cmi/file_mdm.settings.yml
@@ -4,3 +4,4 @@ metadata_cache:
   enabled: true
   expiration: 172800
   disallowed_paths: {  }
+missing_file_log_level: 3
diff --git a/conf/cmi/language/fi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/language/fi/core.entity_form_display.paragraph.phasing.default.yml
@@ -0,0 +1,5 @@
+content:
+  field_phasing_item:
+    settings:
+      title: Lohko
+      title_plural: Lohkot
diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
diff --git a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
diff --git a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '
diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Kuva jota käytetään kuvituskuvana tai taustakuvana lohkossa riippuen siitä minkä tyylin olet lohkolle valinnut.'
diff --git a/...cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/...cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Kuva jota käytetään kuvituskuvana tai taustakuvana lohkossa riippuen siitä minkä tyylin olet lohkolle valinnut.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Kuva jota käytetään linkin yhteydessä.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.phasing.field_show_phase_numbers.yml b/conf/cmi/language/fi/field.field.paragraph.phasing.field_show_phase_numbers.yml
@@ -1 +1,4 @@
 label: 'Näytä vaiheiden numerot'
+settings:
+  on_label: Kyllä
+  off_label: Ei
diff --git a/conf/cmi/language/fi/language.entity.de.yml b/conf/cmi/language/fi/language.entity.de.yml
@@ -0,0 +1 @@
+label: Saksa
diff --git a/conf/cmi/language/fi/language.entity.es.yml b/conf/cmi/language/fi/language.entity.es.yml
@@ -0,0 +1 @@
+label: Espanja
diff --git a/conf/cmi/language/fi/language.entity.fr.yml b/conf/cmi/language/fi/language.entity.fr.yml
@@ -0,0 +1 @@
+label: Ranska
diff --git a/conf/cmi/language/fi/media.type.image.yml b/conf/cmi/language/fi/media.type.image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Mediatyyppi kuville.'
diff --git a/conf/cmi/language/fi/views.view.content.yml b/conf/cmi/language/fi/views.view.content.yml
@@ -8,6 +8,7 @@ display:
           label: Otsikko
         type:
           label: Sisältötyyppi
+          separator: ', '
         name:
           label: Kirjoittaja
         status:

diff --git a/conf/cmi/language/fi/views.view.frontpage_news.yml b/conf/cmi/language/fi/views.view.frontpage_news.yml
@@ -10,3 +10,4 @@ display:
       title: 'Uusimmat uutiset'
       use_more_text: 'Katso kaikki uutiset'
       link_url: /uutiset
+    display_title: 'Uusimmat uutiset'
diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml
@@ -4,6 +4,7 @@ display:
   default:
     display_title: Oletus
     display_options:
+      title: Media
       fields:
         media_bulk_form:
           action_title: Toiminto
@@ -15,6 +16,7 @@ display:
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Suodata tuloksia'
@@ -61,6 +63,8 @@ display:
       fields:
         media_bulk_form:
           action_title: Toiminto
+        name:
+          separator: ', '
         edit_media:
           alter:
             text: 'Muokkaa {{ name }}'

diff --git a/conf/cmi/language/fi/views.view.news.yml b/conf/cmi/language/fi/views.view.news.yml
@@ -2,22 +2,26 @@ display:
   default:
     display_title: Oletus
     display_options:
+      title: 'Uusimmat uutiset'
+      fields:
+        published_at: {  }
+        field_main_image: {  }
+        view_node:
+          text: näkymä
       exposed_form:
         options:
           submit_button: Käytä
           reset_button_label: Palauta
           exposed_sorts_label: Lajittele
           sort_asc_label: Nousevasti
           sort_desc_label: Laskevasti
-      fields:
-        published_at: {  }
-        field_main_image: {  }
-        view_node:
-          text: näkymä
-      title: 'Uusimmat uutiset'
       arguments:
         nid:
           exception:
             title: Kaikki
   latest_news:
     display_title: 'Uusimmat uutiset'
+    display_options:
+      title: 'Uusimmat uutiset'
+      use_more_text: 'Katso kaikki uutiset'
+      link_url: /uutiset
diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/...cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/...cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/media.type.image.yml b/conf/cmi/language/sv/media.type.image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/views.view.news.yml b/conf/cmi/language/sv/views.view.news.yml
@@ -2,21 +2,26 @@ display:
   default:
     display_title: Förvald
     display_options:
+      title: 'Senaste nyheterna'
+      fields:
+        published_at: {  }
+        field_main_image: {  }
+        view_node:
+          text: visa
       exposed_form:
         options:
+          submit_button: Verkställ
           reset_button_label: Återställ
           exposed_sorts_label: 'Sortera efter'
           sort_asc_label: Stigande
           sort_desc_label: Fallande
-      fields:
-        published_at: {  }
-        field_main_image: {  }
-        view_node:
-          text: visa
-      title: 'Senaste nyheterna'
       arguments:
         nid:
           exception:
             title: Alla
   latest_news:
     display_title: 'Senaste nyheterna'
+    display_options:
+      title: 'Senaste nyheterna'
+      use_more_text: 'Se alla nyheter'
+      link_url: /nyheter
diff --git a/conf/cmi/metatag.metatag_defaults.node.yml b/conf/cmi/metatag.metatag_defaults.node.yml
@@ -8,7 +8,7 @@ id: node
 label: Content
 tags:
   title: '[node:title] | [site:page-title-suffix]'
-  description: '[node:field_lead_in]'
+  description: '[node:lead-in]'
   canonical_url: '[node:url]'
   article_modified_time: '[node:created:html_datetime]'
   article_published_time: '[node:created:html_datetime]'
@@ -18,3 +18,4 @@ tags:
   og_url: '[current-page:url:absolute]'
   twitter_cards_image: '[node:shareable-image]'
   og_image: '[node:shareable-image]'
+  og_description: '[node:lead-in]'
diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml
@@ -15,3 +15,4 @@ disable_language_hreflang: false
 excluded_languages: {  }
 enabled_entity_types:
   - node
+  - menu_link_content
diff --git a/tools/make/ansible.mk b/tools/make/ansible.mk
@@ -0,0 +1,38 @@
+ANSIBLE_INVENTORY_PATH ?= ansible/inventory
+ANSIBLE_ROLES_PATH ?= ansible/roles
+ANSIBLE_CHECK_ROLE ?= geerlingguy.docker
+ANSIBLE_PLAYBOOK ?= ansible-playbook
+ANSIBLE_PROVISION ?= ansible/provision.yml
+ANSIBLE_REQUIREMENTS ?= ansible/requirements.yml
+
+PHONY += provision
+provision: INVENTORY ?= production
+provision: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning
+	$(call step,Ansible: Make dry run on provisioning...\n)
+	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION)
+
+PHONY += provision-%
+provision-%: INVENTORY ?= production
+provision-%: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning by tag
+	$(call step,Ansible: Make provisioning by tag "$*"...\n)
+	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --tags="$*"
+
+PHONY += provision-dry-run
+provision-dry-run: INVENTORY ?= production
+provision-dry-run: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make dry run on provisioning
+	$(call step,Ansible: Make dry run on provisioning...\n)
+	@$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --check
+
+PHONY += ansible-install-roles
+ansible-install-roles: ## Install Ansible roles
+	$(call step,Ansible: Install Ansible roles...\n)
+	@ansible-galaxy install -r $(ANSIBLE_REQUIREMENTS) -p $(ANSIBLE_ROLES_PATH)
+
+PHONY += ansible-update-roles
+ansible-update-roles: ## Update Ansible roles
+	$(call step,Ansible: Update Ansible roles...\n)
+	@ansible-galaxy remove --roles-path=$(ANSIBLE_ROLES_PATH) $(shell find $(ANSIBLE_ROLES_PATH) -mindepth 1 -maxdepth 1 -type d -exec basename {} \;) || true
+	@ansible-galaxy install --force-with-deps --role-file=$(ANSIBLE_REQUIREMENTS) --roles-path=$(ANSIBLE_ROLES_PATH)
+
+$(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE):
+	@$(MAKE) ansible-install-roles
diff --git a/tools/make/include.mk b/tools/make/include.mk
@@ -21,6 +21,16 @@ ifeq ($(IS_SYMFONY),yes)
 include $(DRUIDFI_TOOLS_MAKE_DIR)symfony.mk
 endif
 
+#
+# Other tools
+#
+
+HAS_ANSIBLE ?= $(shell test -d ansible && echo yes || echo no)
+
+ifeq ($(HAS_ANSIBLE),yes)
+include $(DRUIDFI_TOOLS_MAKE_DIR)ansible.mk
+endif
+
 #
 # Hosting systems
 #
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		label: Kuva
		label: 'Kuva (tuettu muilla kielillä)'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		label: Bild
		label: 'Bild (stöds på andra språk)'