Dev to main

composer.json

@@ -41,6 +41,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": {

conf/cmi/config_ignore.settings.yml

@@ -2,6 +2,7 @@ _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
 mode: simple
 ignored_config_entities:
+  - 'easy_breadcrumb.settings:home_segment_title'
   - 'hdbt_admin_tools.site_settings:site_settings'
   - 'helfi_rekry_content.job_listings:redirect_403_page'
   - 'helfi_rekry_content.job_listings:search_page'

conf/cmi/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

conf/cmi/file_mdm.settings.yml

@@ -4,3 +4,4 @@ metadata_cache:
   enabled: true
   expiration: 172800
   disallowed_paths: {  }
+missing_file_log_level: 3

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]'

conf/cmi/simple_sitemap.settings.yml

@@ -15,3 +15,4 @@ disable_language_hreflang: false
 excluded_languages: {  }
 enabled_entity_types:
   - node
+  - menu_link_content

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

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
 #