Merge pull request #552 from City-of-Helsinki/dev

Dev to main

composer.json

@@ -39,6 +39,9 @@
         "weitzman/drupal-test-traits": "^2.1"
     },
     "conflict": {
+        "drupal/core": ">=10.2",
+        "drupal/core-composer-scaffold": ">=10.2",
+        "drupal/core-dev": ">=10.2",
         "drupal/drupal": "*"
     },
     "config": {

conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml

@@ -8,15 +8,17 @@ dependencies:
     - field.field.tpr_unit.tpr_unit.field_metatags
     - field.field.tpr_unit.tpr_unit.field_unit_type
   module:
+    - allowed_formats
     - hdbt_admin_tools
     - helfi_tpr
     - media_library
     - metatag
     - paragraphs
     - path
     - readonly_field_widget
+    - text
 _core:
-  default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ
+  default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -54,7 +56,7 @@ content:
     third_party_settings: {  }
   address:
     type: readonly_field_widget
-    weight: 19
+    weight: 20
     region: content
     settings:
       label: above
@@ -112,6 +114,17 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  enrich_description:
+    type: text_textarea
+    weight: 19
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings:
+      allowed_formats:
+        hide_help: '1'
+        hide_guidelines: '1'
   field_content:
     type: paragraphs
     weight: 28

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml

@@ -18,7 +18,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0
+  default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -103,6 +103,13 @@ content:
     third_party_settings: {  }
     weight: 8
     region: content
+  enrich_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   field_content:
     type: entity_reference_revisions_entity_view
     label: hidden

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml

@@ -12,7 +12,7 @@ dependencies:
     - address
     - helfi_tpr
 _core:
-  default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU
+  default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
 id: tpr_unit.tpr_unit.minimal
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -52,6 +52,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_lower_content: true
   field_metatags: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml

@@ -14,7 +14,7 @@ dependencies:
     - helfi_tpr
     - imagecache_external
 _core:
-  default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0
+  default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ
 id: tpr_unit.tpr_unit.teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -72,6 +72,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_lower_content: true
   field_metatags: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml

@@ -15,7 +15,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ
+  default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4
 id: tpr_unit.tpr_unit.teaser_with_image
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -73,6 +73,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_lower_content: true
   field_metatags: true

conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml

@@ -15,7 +15,7 @@ dependencies:
     - imagecache_external
     - telephone
 _core:
-  default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI
+  default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc
 id: tpr_unit.tpr_unit.wide_teaser
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -88,6 +88,7 @@ hidden:
   created: true
   description: true
   email: true
+  enrich_description: true
   field_content: true
   field_lower_content: true
   field_metatags: true

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

@@ -6,7 +6,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]'
@@ -16,3 +16,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 @@ enabled_entity_types:
   - node
   - tpr_service
   - tpr_unit
+  - 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
 #