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

Automatic update
City-of-Helsinki · Jun 13, 2024 · d673882 · d673882
2 parents 4777373 + 3ac2f4f
commit d673882
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 63 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-6
+7
diff --git a/compose.yaml b/compose.yaml
@@ -100,17 +100,17 @@ services:
       - 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.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.entrypoints=https"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.tls=true"
+      - "traefik.http.services.${COMPOSE_PROJECT_NAME}-elastic-proxy.loadbalancer.server.port=8080"
       - "traefik.docker.network=stonehenge-network"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowmethods=GET,OPTIONS,POST"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowheaders=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolalloworiginlist=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolmaxage=100"
       - "traefik.http.middlewares.cors-header.headers.addvaryheader=true"
-      - "traefik.http.routers.nginx.middlewares=cors-header"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.middlewares=cors-header"
     depends_on:
       - elastic
     profiles:

diff --git a/composer.lock b/composer.lock
diff --git a/docker/elastic-proxy/elastic.conf b/docker/elastic-proxy/elastic.conf
@@ -8,7 +8,7 @@ server {
       return 200 '{"status":"success","result":"Proxy alive"}';
     }
 
-    location ~ ^/([a-z][a-z_-]*)/(_search|_msearch)$ {
+    location ~ ^/([a-z][a-z_,-]*)/(_search|_msearch)$ {
         limit_except GET POST {
            deny all;
         }