Merge pull request #478 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Jun 5, 2024 · 1d27bac · 1d27bac
2 parents a3a3d01 + ffda84d
commit 1d27bac
Show file tree

Hide file tree

Showing 101 changed files with 1,146 additions and 413 deletions.
diff --git a/.env b/.env
@@ -29,3 +29,6 @@ HELBIT_CLIENT_ID=
 
 # URL for Elasticsearch (for job search)
 ELASTIC_PROXY_URL=https://elastic-helfi-rekry.docker.so
+
+# Hakuvahti URL
+HAKUVAHTI_URL=http://helfi-rekry.docker.so:3000
diff --git a/README.md b/README.md
@@ -40,3 +40,11 @@ This will log you inside the app container:
 ```
 $ make shell
 ```
+
+## Enable Hakuvahti features
+
+To enable [Hakuvahti features](https://github.com/City-of-Helsinki/helfi-hakuvahti) for local development or usage, you need to first install Hakuvahti and then enable Hakuvahti network in compose.yaml.
+
+These lines are commented out with comment `# Uncomment to enable Hakuvahti:`
+
+Specifically what is commented out: `HAKUVAHTI_URL` environment variable, `helfi-hakuvahti_helfi-hakuvahti-network` for `app` and `elastic` containers. Finally it needs to be listed under `networks`. This enables Hakuvahti server to access ElasticSearch.
diff --git a/azure-pipelines-devtest.yml b/azure-pipelines-devtest.yml
diff --git a/azure-pipelines-prod.yml b/azure-pipelines-prod.yml
diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml
diff --git a/compose.yaml b/compose.yaml
@@ -105,6 +105,12 @@ services:
       - "traefik.http.services.nginx.loadbalancer.server.port=8080"
       - "traefik.http.routers.nginx.tls=true"
       - "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"
     depends_on:
       - elastic
     profiles: