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

Automatic update
City-of-Helsinki · May 22, 2024 · 73faf45 · 73faf45
2 parents 26da559 + e389902
commit 73faf45
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 69 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -87,6 +87,28 @@ 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"
+  elastic-proxy:
+    container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy"
+    image: nginxinc/nginx-unprivileged:alpine-perl
+    environment:
+      ELASTICSEARCH_URL: "http://elastic:9200"
+    volumes:
+      - ./docker/elastic-proxy/nginx.conf:/etc/nginx/nginx.conf
+      - ./docker/elastic-proxy/elastic.conf:/etc/nginx/templates/default.conf.template
+    networks:
+      - stonehenge-network
+      - internal
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.nginx.entrypoints=https"
+      - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
+      - "traefik.http.services.nginx.loadbalancer.server.port=8080"
+      - "traefik.http.routers.nginx.tls=true"
+      - "traefik.docker.network=stonehenge-network"
+    depends_on:
+      - elastic
+    profiles:
+      - search
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.0
     container_name: "${COMPOSE_PROJECT_NAME}-elastic"

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/language/tr/core.date_format.html_month.yml b/conf/cmi/language/tr/core.date_format.html_month.yml