Update configuration

City-of-Helsinki · Sep 20, 2023 · 933c2dc · 933c2dc
1 parent efa5fe9
commit 933c2dc
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 75 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -88,8 +88,8 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    region: content
     weight: 36
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -180,8 +180,8 @@ content:
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    region: content
     weight: 33
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -207,8 +207,8 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    region: content
     weight: 31
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -245,8 +245,8 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    region: content
     weight: 32
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -255,8 +255,8 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    region: content
     weight: 34
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -298,8 +298,8 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    region: content
     weight: 35
+    region: content
     settings:
       label: above
       formatter_type: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -3,13 +3,13 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo
+  default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0
 id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
@@ -39,7 +39,7 @@ field_mapper_config:
       value: '$.attributes["field_announcement_link"]["uri"]'
 storage_client_id: helfi_announcements
 storage_client_config: {  }
-persistent_cache_max_age: 600
+persistent_cache_max_age: -1
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

diff --git a/conf/cmi/helfi_api_base.delete_revisions.yml b/conf/cmi/helfi_api_base.delete_revisions.yml
@@ -0,0 +1,6 @@
+entity_types:
+  - node
+  - paragraph
+  - tpr_unit
+  - tpr_service
+  - tpr_errand_service
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -82,22 +82,6 @@ services:
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true"
       - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081"
       - "traefik.docker.network=stonehenge-network"
-  robo:
-    image: ghcr.io/city-of-helsinki/drupal-robo:latest
-    shm_size: '2gb'
-    tty: true
-    volumes:
-      - .:/app:delegated
-    networks:
-      - internal
-      - stonehenge-network
-    depends_on:
-      - app
-    profiles:
-      - testing
-    extra_hosts:
-      - "${DRUPAL_HOSTNAME}:host-gateway"
-      - "varnish-${DRUPAL_HOSTNAME}:host-gateway"
 networks:
   internal:
     external: false