Skip to content

Commit

Permalink
Update configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
hel-platta-automation authored and github-actions[bot] committed Mar 18, 2024
1 parent f802193 commit a800022
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 178 deletions.
209 changes: 74 additions & 135 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ dependencies:
- paragraphs.paragraphs_type.event_list
module:
- link
- select2
- text
_core:
default_config_hash: 26rzwNcMiiF5Bucl9iUliZYoL4vZcdmdNkYBAr9DYOU
default_config_hash: dZwlyUF3NrPYw3C78NA0FM0m7EBnAdTWaLWhAs-jtXo
id: paragraph.event_list.default
targetEntityType: paragraph
bundle: event_list
Expand Down Expand Up @@ -68,14 +69,14 @@ content:
display_label: true
third_party_settings: { }
field_filter_keywords:
type: entity_reference_autocomplete_tags
type: select2_entity_reference
weight: 8
region: content
settings:
width: 100%
autocomplete: true
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_free_events:
type: boolean_checkbox
Expand Down
40 changes: 20 additions & 20 deletions conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,16 +177,6 @@ content:
sidebar: false
use_details: true
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 30
Expand Down Expand Up @@ -384,16 +374,6 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
toc_enabled:
type: boolean_checkbox
weight: 3
Expand Down Expand Up @@ -442,6 +422,26 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
hidden:
created: true
field_categories: true
Expand Down
28 changes: 14 additions & 14 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,6 @@ content:
third_party_settings: { }
weight: 17
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
highlights:
type: tpr_connection
label: hidden
Expand Down Expand Up @@ -268,13 +261,6 @@ content:
third_party_settings: { }
weight: 16
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
toc_enabled:
type: boolean
label: hidden
Expand Down Expand Up @@ -311,6 +297,20 @@ content:
third_party_settings: { }
weight: 12
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
hidden:
created: true
field_categories: true
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/metatag.metatag_defaults.global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ tags:
twitter_cards_page_url: '[current-page:url]'
twitter_cards_title: '[current-page:title] | [site:page-title-suffix]'
twitter_cards_type: summary_large_image
og_image: '[site:default-og-image]'
twitter_cards_image: '[site:default-og-image]'
og_image: '[site:shareable-image]'
twitter_cards_image: '[site:shareable-image]'
og_site_name: '[site:page-title-suffix]'
4 changes: 2 additions & 2 deletions conf/cmi/metatag.metatag_defaults.tpr_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ langcode: en
status: true
dependencies: { }
_core:
default_config_hash: uQHYkeDAlKDP9QzcRcKciZc5r2PVOzL_jXwfU2ac4iY
default_config_hash: r_fYCDlLAs4HfH-xN1R6bh_xDzIajxsKD23WiQ11B2A
id: tpr_unit
label: 'TPR - Unit'
tags:
Expand All @@ -15,7 +15,7 @@ tags:
article_published_time: '[tpr_unit:created:html_datetime]'
og_description: '[tpr_unit:description:summary]'
og_email: '[tpr_unit:email]'
og_image: '[tpr_unit:picture]'
og_image: '[tpr_unit:shareable-image]'
og_latitude: '[tpr_unit:latitude]'
og_longitude: '[tpr_unit:longitude]'
og_phone_number: '[tpr_unit:phone]'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}"
APP_ENV: "${APP_ENV:-local}"
ELASTIC_PROXY_URL: ${ELASTIC_PROXY_URL:-""}
DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish"
DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish,http://${COMPOSE_PROJECT_NAME}"
DRUPAL_REVERSE_PROXY_ADDRESS: helfi-proxy.docker.so
DRUSH_OPTIONS_URI: "https://${DRUPAL_HOSTNAME}"
# To enable xdebug, run `export XDEBUG_ENABLE=true` before (re)starting your project.
Expand Down
10 changes: 10 additions & 0 deletions docker/openshift/crons/linked-events.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

while true
do
# Allow migrations to be run every 3 hours and reset stuck migrations every 12 hours.
drush migrate:import linked_events_keywords --interval 10800 --reset-threshold 43200 --no-progress

# Sleep for 12 hours
sleep 86400
done

0 comments on commit a800022

Please sign in to comment.