Merge pull request #981 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Nov 26, 2024 · eb9a3a3 · eb9a3a3
2 parents 20b5ecb + 0ac3bea
commit eb9a3a3
Show file tree

Hide file tree

Showing 20 changed files with 130 additions and 102 deletions.
diff --git a/.env b/.env
@@ -7,7 +7,7 @@ COMPOSE_PROJECT_NAME=helfi-kymp
 PROJECT_NAME=liikenne
 
 # Default Docker compose profiles
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
 
 # OpenShift project name
 OC_PROJECT_NAME=hki-kanslia-liikenne-test

diff --git a/compose.yaml b/compose.yaml
@@ -151,13 +151,12 @@ services:
       - search
   artemis:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
-    image: quay.io/artemiscloud/activemq-artemis-broker
-    environment:
-      AMQ_EXTRA_ARGS: "--user admin --password admin"
+    image: apache/activemq-artemis
     depends_on:
       - app
     networks:
       - internal
+      - stonehenge-network
     profiles:
       - queue
   chromium:

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   status:
     type: boolean_checkbox
     weight: 12

diff --git a/conf/cmi/search_api.index.districts.yml b/conf/cmi/search_api.index.districts.yml
@@ -9,9 +9,9 @@ dependencies:
     - field.storage.node.field_subdistricts
     - search_api.server.elastic_kymp
   module:
-    - node
+    - helfi_react_search
     - media
-    - search_api
+    - node
 id: districts
 name: Districts
 description: ''

diff --git a/conf/cmi/search_api.index.districts_for_filters.yml b/conf/cmi/search_api.index.districts_for_filters.yml
@@ -5,8 +5,8 @@ dependencies:
   config:
     - search_api.server.elastic_kymp
   module:
+    - helfi_react_search
     - node
-    - search_api
 id: districts_for_filters
 name: 'Districts for filters'
 description: 'Districts to be used for search filters.'

diff --git a/conf/cmi/search_api.index.project_phases.yml b/conf/cmi/search_api.index.project_phases.yml
@@ -5,8 +5,8 @@ dependencies:
   config:
     - search_api.server.elastic_kymp
   module:
+    - helfi_react_search
     - taxonomy
-    - search_api
 id: project_phases
 name: 'Project phases'
 description: 'Project phases from taxonomy to be used for search filters.'