Skip to content

Commit 02b2f76

Browse files
authored
Merge pull request #422 from City-of-Helsinki/dev
Dev to main
2 parents e4e295a + b409c6b commit 02b2f76

6 files changed

Lines changed: 156 additions & 154 deletions

File tree

.platform/schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6
1+
7

compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ services:
100100
- internal
101101
labels:
102102
- "traefik.enable=true"
103-
- "traefik.http.routers.nginx.entrypoints=https"
104-
- "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
105-
- "traefik.http.services.nginx.loadbalancer.server.port=8080"
106-
- "traefik.http.routers.nginx.tls=true"
103+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.entrypoints=https"
104+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
105+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.tls=true"
106+
- "traefik.http.services.${COMPOSE_PROJECT_NAME}-elastic-proxy.loadbalancer.server.port=8080"
107107
- "traefik.docker.network=stonehenge-network"
108108
- "traefik.http.middlewares.cors-header.headers.accesscontrolallowmethods=GET,OPTIONS,POST"
109109
- "traefik.http.middlewares.cors-header.headers.accesscontrolallowheaders=*"
110110
- "traefik.http.middlewares.cors-header.headers.accesscontrolalloworiginlist=*"
111111
- "traefik.http.middlewares.cors-header.headers.accesscontrolmaxage=100"
112112
- "traefik.http.middlewares.cors-header.headers.addvaryheader=true"
113-
- "traefik.http.routers.nginx.middlewares=cors-header"
113+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.middlewares=cors-header"
114114
depends_on:
115115
- elastic
116116
profiles:

0 commit comments

Comments
 (0)