diff --git a/CHANGELOG.md b/CHANGELOG.md index 50966d3..c66d28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,65 @@ # Changelog +## 1.37.0 (2025-10-24) +### Backend +- Add municipalities and werkingsgebieden in the area of Brussel [OP-3669] +- Updated mu-search configuration with source [OP-3670] + +### Deploy notes +``` +drc restart migrations-triggering-indexing; drc logs -ft --tail=200 migrations-triggering-indexing +drc up -d frontend +scripts/reset-elastic.sh +``` + +## 1.36.0 (2025-10-03) +### Dashboard +- Enable ACM/IDM for the dashboard [OP-3674] + +#### QA +Configure the environment variables for the QA ACM/IDM environment: + +```yml + frontend-dashboard: + environment: + EMBER_ACMIDM_CLIENT_ID: "03382bf4-4886-4fb6-8602-945ad3080a7a" + EMBER_ACMIDM_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth" + EMBER_ACMIDM_REDIRECT_URL: "https://dashboard.organisaties.abb.lblod.info/authorization/callback" + EMBER_ACMIDM_LOGOUT_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/logout" + EMBER_ACMIDM_SCOPE: "openid vo profile abb_organisatieportaal" + + login-dashboard: + environment: + MU_APPLICATION_AUTH_DISCOVERY_URL: "https://authenticatie-ti.vlaanderen.be/op" + MU_APPLICATION_AUTH_CLIENT_ID: "03382bf4-4886-4fb6-8602-945ad3080a7a" + MU_APPLICATION_AUTH_REDIRECT_URI: "https://dashboard.organisaties.abb.lblod.info/authorization/callback" + MU_APPLICATION_AUTH_CLIENT_SECRET: "snip" # see ticket for secret + +``` + +Link the new domain name to QA (and remove from dev) + +#### PROD +Configure the environment variables for the PROD ACM/IDM environment once the values are known. + +Link the new domain name to PROD + DNS config to the server + +#### CLI +``` +drc restart migrations +drc restart dispatcher db +drc up -d --remove-orphans +``` + +### Frontend +- Bump to [v1.34.1](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.34.1) [OP-3638] +- Remove province for addresses in the Brussels area [OP-3638] & [OP-3648] + +### Deploy notes +``` +drc pull frontend; drc up -d frontend +drc restart migrations-triggering-indexing; drc logs -ft --tail=200 migrations-triggering-indexing +``` + ## v1.35.2 (2025-11-04) ### Backend - Fix camel case name of municipality Heist-op-den-Berg in addresses [OP-3694] @@ -27,6 +88,7 @@ drc restart delta-producer-publication-graph-maintainer - datafix: cleanup of duplicate memberships [OP-3634] - Fix KBO organizations' date formats [OP-3560] + ### Deploy notes ``` drc pull scope-of-operation; drc up -d scope-of-operation diff --git a/README.md b/README.md index 1884f32..4fa218d 100644 --- a/README.md +++ b/README.md @@ -185,26 +185,3 @@ To make sure the app can share data, producers need to be set up. There is an in ) } ``` - -## Configuring the dashboard -### Accessing the dashboard from your local machine - -Since we use dispatcher v2, which dispatches on hostname, we'll have to update `/etc/hosts`. -Add an entry similar to the following. Ensure the first part of the domain starts with `dashboard`.: - -``` -127.0.0.1 dashboard.localhost -``` - -### Creating new users -For now, we use specific logins for the dashboard users. Each environment has its own passwords. - -To add a user, make sure to have [mu-cli](https://github.com/mu-semtech/mu-cli) installed first. -Then in `docker-compose.override.yml` -``` - dashboard-login: - environment: - MU_APPLICATION_SALT: 'a_random_string_with_sufficient_entropy_hence_not_this_one' -``` -You can now generate a user by running `mu script project-scripts generate-dashboard-login` and following the steps. -Restart `migrations` and it should insert the new user into the database. \ No newline at end of file diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 0390610..2ef99a3 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -111,11 +111,9 @@ defmodule Acl.UserGroups.Config do %AccessByQuery{ vars: [], query: "PREFIX ext: - PREFIX mu: - SELECT DISTINCT ?account WHERE { - ?account. - ?account ?session_role. - FILTER( ?session_role = \"dashboard-user\" ) + SELECT DISTINCT ?session WHERE { + VALUES ?session { } + ?session ext:sessionRole \"LoketLB-AdminDashboardOrganisatiePortaalGebruiker\" . }" } end @@ -219,10 +217,10 @@ defmodule Acl.UserGroups.Config do } ] }, - # // dashboard users + # // Dashboard admin %GroupSpec{ - name: "dashboard-users", - useage: [:read], + name: "o-admin-rwf", + useage: [:read, :write, :read_for_write], access: can_access_dashboard(), graphs: [ %GraphSpec{ diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 5100511..4a1591d 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -306,7 +306,7 @@ defmodule Dispatcher do end match "/sessions/*path", %{ reverse_host: ["dashboard" | _rest] } do - Proxy.forward conn, path, "http://dashboard-login/sessions/" + Proxy.forward conn, path, "http://login-dashboard/sessions/" end match "/sessions/*path", %{accept: [:any], layer: :api} do diff --git a/config/migrations-triggering-indexing/2025/20250703095300-remove-province-for-addresses-in-brussels-gewest.sparql b/config/migrations-triggering-indexing/2025/20250703095300-remove-province-for-addresses-in-brussels-gewest.sparql new file mode 100644 index 0000000..5d19fa3 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20250703095300-remove-province-for-addresses-in-brussels-gewest.sparql @@ -0,0 +1,38 @@ +DELETE { + GRAPH { + ?s ?province ; + ?werkingsgebied . + } +} WHERE { + GRAPH { + VALUES ?postCode { + "1070" + "1000" + "1020" + "1120" + "1130" + "1050" + "1040" + "1140" + "1083" + "1090" + "1081" + "1160" + "1030" + "1082" + "1060" + "1080" + "1210" + "1200" + "1150" + "1180" + "1190" + "1170" + } + + ?s a ; + ?postCode ; + ?province ; + ?werkingsgebied . + } +} diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-anderlecht-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-anderlecht-municipality.sparql new file mode 100644 index 0000000..c0cc3bd --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-anderlecht-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "1c491c48-643f-44c3-bdd8-2ba8f11f4d5d" ; + "Anderlecht" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "1e912379-eeab-4d33-8f6c-2e160e230dab" ; + ; + "Anderlecht" ; + "Anderlecht" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "d422793b-ee14-4c49-9633-2460a2bd5597" . + + + a ; + "0206582284" ; + "6a614bee-ce07-44ae-b9b8-6c62b5d59f03" . + + + ; + a ; + "OVO-nummer" ; + "55f5718e-753d-4bf5-9e54-51107cb0233e" . + + + a ; + "OVO025866" ; + "d78905a7-c997-4faa-a431-0fc536e5c13c" . + + + a ; + "dbd1ab23-f6c8-40eb-92c1-ad96768581be" ; + ; + ; + . + + + a ; + "0a39a310-4e93-4443-989c-1ea630f82033" ; + "info@anderlecht.brussels" ; + "tel:+3225580800" ; + "Primary" ; + "https://www.anderlecht.be/" . + + + a ; + "cc216687-6049-41ae-8fd7-6757117e0e16" ; + "Anderlecht" ; + "België" ; + "1" ; + "Raadsplein 1, 1070 Anderlecht, België" ; + "1070" ; + "Raadsplein" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-brussel-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-brussel-municipality.sparql new file mode 100644 index 0000000..1b7436a --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-brussel-municipality.sparql @@ -0,0 +1,92 @@ +INSERT DATA { + GRAPH { + + a ; + "fb36ff92-84b7-4d90-b32c-f7b7815b7711" ; + "Brussel" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "3d6f7cfe-43e3-4b87-bb2f-0bd8c497ab33" ; + ; + "Brussel" ; + "Brussel" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + a ; + "7a48ea24-5557-420a-bdd0-712d05309ab7" ; + ; + ; + ; + . + + + a ; + "5dfdca74-05a9-43d4-963e-d5376f668060" ; + ; + . + + + ; + a ; + "KBO nummer" ; + "49127169-aff3-44a3-8982-658e4055eef4" . + + + a ; + "0207373429" ; + "3005b2ac-b747-4a06-acc1-e66438a702c6" . + + + ; + a ; + "OVO-nummer" ; + "3c8dd5c2-7a40-4b44-bc1d-cc9a93340159" . + + + a ; + "OVO008216" ; + "f33c418d-2dde-45ce-baad-2a7f26a62f4e" . + + + a ; + "d842785a-5684-4573-8248-57bf8c1f38bd" ; + ; + ; + . + + + a ; + "7c3f8a78-ccae-46cd-8d0b-4c551aec1350" ; + "europa@brucity.be" ; + "tel:+3222792211" ; + "Primary" ; + "https://www.brussel.be/" . + + + a ; + "2c73b8c1-fc05-4bdc-9439-9afc97d78f43" ; + "Brussel" ; + "België" ; + "4" ; + "Hallenstraat 4, 1000 Brussel, België" ; + "1000" ; + "Hallenstraat" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-elsene-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-elsene-municipality.sparql new file mode 100644 index 0000000..e155d4a --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-elsene-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "331fbb80-ba0a-4a33-95e4-5d2674415c72" ; + "Elsene" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "4d892d46-2fda-4c24-89da-d4cdc2ac379d" ; + ; + "Elsene" ; + "Elsene" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "8f918141-e2e8-470c-8edb-fefc45743afb" . + + + a ; + "0207401341" ; + "644381f5-cfaa-45ab-bf13-79475359c7f9" . + + + ; + a ; + "OVO-nummer" ; + "2b39418f-c1c2-4880-b3a9-c6e8911d779b" . + + + a ; + "OVO025861" ; + "1e5698d7-4299-40de-a1a9-c0e2fa571c27" . + + + a ; + "6fe561e2-76aa-4c99-83e6-083f2c47c7e0" ; + ; + ; + . + + + a ; + "b200bda3-74da-4fe6-a384-95cc3b10460c" ; + "secretariaat@elsene.be" ; + "tel:+3225156111" ; + "Primary" ; + "https://www.elsene.be/" . + + + a ; + "5ccba902-3d32-4fac-b51f-ad6fa05f9d6c" ; + "Elsene" ; + "België" ; + "168" ; + "Elsense Steenweg 168, 1050 Elsene, België" ; + "1050" ; + "Elsense Steenweg" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-etterbeek-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-etterbeek-municipality.sparql new file mode 100644 index 0000000..96c240e --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-etterbeek-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "2a8f2022-6a4b-421d-a716-7c7f85b3e318" ; + "Etterbeek" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "333683e2-4a5a-4639-af0e-bcec85fe9d21" ; + ; + "Etterbeek" ; + "Etterbeek" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "56ecd55e-f118-4203-a053-8a55c2cf3f67" . + + + a ; + "0207365610" ; + "221ebf76-6ebb-4598-9c84-6c4cf25fbb12" . + + + ; + a ; + "OVO-nummer" ; + "afb8b3b1-2dea-48b4-90bb-d2b2d12fdf01" . + + + a ; + "OVO025862" ; + "2144fff7-78cf-4151-9179-713d83437300" . + + + a ; + "dc3537b6-0349-4f91-8428-41646f845574" ; + ; + ; + . + + + a ; + "f729b015-2bb2-4c0a-a904-2332a1adf279" ; + "info@etterbeek.be" ; + "tel:+3226272111" ; + "Primary" ; + "https://etterbeek.brussels" . + + + a ; + "4c4c7145-066e-460d-aad0-2af638f41dfb" ; + "Etterbeek" ; + "België" ; + "115" ; + "Oudergemlaan 115, 1040 Etterbeek, België" ; + "1040" ; + "Oudergemlaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-evere-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-evere-municipality.sparql new file mode 100644 index 0000000..82171f8 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-evere-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "cd00668d-9233-4108-b690-f70e2f2e28a0" ; + "Evere" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "56c4b098-45e7-4115-b2f7-a56f8fb9a1e0" ; + ; + "Evere" ; + "Evere" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "ecb0f120-36b3-492c-b20e-8009fa8e4828" . + + + a ; + "0207365709" ; + "cc8deba0-3d7c-4ecc-96b0-9aea331d5bda" . + + + ; + a ; + "OVO-nummer" ; + "80edaf56-2f42-451d-aa7f-473450386b67" . + + + a ; + "OVO025863" ; + "248e8391-e2dc-4b4b-a687-8c839376495f" . + + + a ; + "9080f879-d78d-47fc-b083-8912fb31474e" ; + ; + ; + . + + + a ; + "e6255d3e-e826-4b82-87cf-52cc1d72b090" ; + "evere@brutele.be" ; + "tel:+3222476262" ; + "Primary" ; + "https://evere.brussels/" . + + + a ; + "6f1c3769-098a-4640-be42-cdfb55a422b6" ; + "Evere" ; + "België" ; + "10" ; + "S. Hoedemaekerssquare 10, 1140 Evere, België" ; + "1140" ; + "S. Hoedemaekerssquare" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ganshoren-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ganshoren-municipality.sparql new file mode 100644 index 0000000..1ec53f8 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ganshoren-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "77b98d71-5c90-484d-ba2f-2ca9bafe1abb" ; + "Ganshoren" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "05171f8f-b15f-4462-a46e-4b93695593f8" ; + ; + "Ganshoren" ; + "Ganshoren" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "9ee7b37b-dcb2-41f7-a623-4b409b21c514" . + + + a ; + "0207401044" ; + "63a1ccfa-3545-4883-8f56-2bad82302028" . + + + ; + a ; + "OVO-nummer" ; + "f3c1a6c7-23a7-49df-9338-065659186575" . + + + a ; + "OVO026992" ; + "6fef2797-0b22-4e6e-b036-4590362bf129" . + + + a ; + "ed10ce9c-c582-4b49-9ba6-9e228868f860" ; + ; + ; + . + + + a ; + "8732662e-d6f0-4845-9881-4a8909f3d216" ; + "ganshoren@ganshoren.brussels" ; + "tel:+3224651277" ; + "Primary" ; + "https://www.ganshoren.be/" . + + + a ; + "a219f021-e4a5-47a9-a774-cefb3b879a1f" ; + "Ganshoren" ; + "België" ; + "140" ; + "Keizer Karellaan 140, 1083 Ganshoren, België" ; + "1083" ; + "Keizer Karellaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-jette-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-jette-municipality.sparql new file mode 100644 index 0000000..1cfc37d --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-jette-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "bec2b245-2cc5-4140-98f3-d81e24ca6b0a" ; + "Jette" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "0a162b7b-8576-472f-b0e7-4d244b97e2a6" ; + ; + "Jette" ; + "Jette" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "eeefd726-7c1a-4c16-89d2-c49c154a0e63" . + + + a ; + "0207366895" ; + "82089dca-7666-4a0e-8054-0f2994a872e8" . + + + ; + a ; + "OVO-nummer" ; + "f9b1f14f-0655-4a80-97ce-6c52ada0dcc7" . + + + a ; + "OVO025864" ; + "f7017215-3845-46e7-90d4-cfcec08e14f9" . + + + a ; + "b0d6de26-6759-4174-9ede-e2705504a0ca" ; + ; + ; + . + + + a ; + "36b55789-f70b-4212-a93c-35f04fcf6c3f" ; + "info@jette.brussels" ; + "tel:+3224231211" ; + "Primary" ; + "https://jette.brussels/" . + + + a ; + "b8b6e0ae-9c03-4878-b196-f60a8c7501ed" ; + "Jette" ; + "België" ; + "102" ; + "Wemmelse Steenweg 102, 1090 Jette, België" ; + "1090" ; + "Wemmelse Steenweg" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-koekelberg-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-koekelberg-municipality.sparql new file mode 100644 index 0000000..3a1bfe2 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-koekelberg-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "457e89c4-a41b-41ad-b20d-03086c402639" ; + "Koekelberg" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "d38eb8bd-3ff1-4cec-b94d-29675eb3f984" ; + ; + "Koekelberg" ; + "Koekelberg" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "4abab8a9-7c79-4330-8fc7-e4a325604b2d" . + + + a ; + "0207372538" ; + "bacf971e-7143-4e74-97c6-89ce746aeb09" . + + + ; + a ; + "OVO-nummer" ; + "f9ec107a-73cd-4a9e-882b-bf714b6b9485" . + + + a ; + "OVO025865" ; + "8a86fb4a-c30c-44b2-9713-93506f1f1d6e" . + + + a ; + "fe1ed9ff-3e07-4f67-bbc3-9fae906f6cc3" ; + ; + ; + . + + + a ; + "11f67d9e-0d64-4f09-825c-f1afebdfe11b" ; + "info.1081@koekelberg.brussels" ; + "tel:+3224121411" ; + "Primary" ; + "https://www.koekelberg.be/" . + + + a ; + "aed51fac-fbf4-4cb4-8bac-9fbcf65cee49" ; + "Koekelberg" ; + "België" ; + "6" ; + "Henri Vanhuffelplein 6, 1081 Koekelberg, België" ; + "1081" ; + "Henri Vanhuffelplein" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-oudergem-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-oudergem-municipality.sparql new file mode 100644 index 0000000..a9bf408 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-oudergem-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "a3830237-98c6-4b8b-83f5-6de34e6243ac" ; + "Oudergem" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "561d167f-4633-46e3-bf55-b33ff926096c" ; + ; + "Oudergem" ; + "Oudergem" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "178612d1-9355-42aa-9168-4f110025952e" . + + + a ; + "0207540408" ; + "abece0d8-d7bf-4f61-92f6-9bde471bc7bd" . + + + ; + a ; + "OVO-nummer" ; + "064b5191-4abd-4d39-9598-aea388e3da93" . + + + a ; + "OVO025826" ; + "25e502d8-62a5-4a97-bb7f-52d91b335067" . + + + a ; + "fc4773ca-58dd-4c36-a5c6-71d222f3361a" ; + ; + ; + . + + + a ; + "65632038-54fe-4aab-9457-c0f0d0a5c568" ; + "relpub@auderghem.be" ; + "tel:+3226764811" ; + "Primary" ; + "https://www.oudergem.be/" . + + + a ; + "95c6a03f-2cd4-4492-8c0b-755a65650f3c" ; + "Oudergem" ; + "België" ; + "12" ; + "Emile Idiersstraat 12, 1160 Oudergem, België" ; + "1160" ; + "Emile Idiersstraat" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-schaarbeek-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-schaarbeek-municipality.sparql new file mode 100644 index 0000000..f8cb1e3 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-schaarbeek-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "aaec0a10-8bb9-4644-8be5-89da0920dbed" ; + "Schaarbeek" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "1a5177fd-6068-4640-ab8c-6454400033d8" ; + ; + "Schaarbeek" ; + "Schaarbeek" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "d9ea7d1d-87f3-4178-856c-265a95acbc91" . + + + a ; + "0207367687" ; + "e9479cf1-e50e-4761-8128-b8992216263f" . + + + ; + a ; + "OVO-nummer" ; + "14e75d82-eff1-49fc-a753-cb96420f8c8a" . + + + a ; + "OVO025820" ; + "6c6f25f4-0ecc-4280-93b5-b6afb2cee605" . + + + a ; + "be200efc-8399-4cd6-a913-d64a239bce78" ; + ; + ; + . + + + a ; + "968afe2c-70b9-4d7a-8ca1-5f6c36575ddd" ; + "info@1030.be" ; + "tel:+3222447511" ; + "Primary" ; + "https://www.1030.be/" . + + + a ; + "9dffbe51-9a41-4f98-80e5-33b76b76b586" ; + "Schaarbeek" ; + "België" ; + "100" ; + "Colignonplein 100, 1030 Schaarbeek, België" ; + "1030" ; + "Colignonplein" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-agatha-berchem-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-agatha-berchem-municipality.sparql new file mode 100644 index 0000000..fab6436 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-agatha-berchem-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "e5b0ab35-aa0d-4f73-ad2d-446bd67f299d" ; + "Sint-Agatha-Berchem" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "6c7276cb-5aaf-41fd-917d-22df996ac186" ; + ; + "Sint-Agatha-Berchem" ; + "Sint-Agatha-Berchem" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "e73cddaa-21fc-4464-b759-6591e15c213d" . + + + a ; + "0207541594" ; + "4576728a-b5d3-4fcd-9290-6cee5473de53" . + + + ; + a ; + "OVO-nummer" ; + "0b0301c4-eb97-4ba4-b8b6-c9e4c089e06c" . + + + a ; + "OVO025827" ; + "fe86c32e-8910-4530-8042-cb4b9dddf859" . + + + a ; + "2d163096-b31e-4006-b3c0-e46c87325aa2" ; + ; + ; + . + + + a ; + "536dcfb0-d384-41d5-ac82-770cda4ffaeb" ; + "info@berchem.brussels" ; + "tel:+3224640411" ; + "Primary" ; + "https://berchem.brussels/" . + + + a ; + "02b6b31a-893e-45c4-94f3-964d58039bff" ; + "Sint-Agatha-Berchem" ; + "België" ; + "33" ; + "Koning Albertlaan 33, 1082 Sint-Agatha-Berchem, België" ; + "1082" ; + "Koning Albertlaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-gillis-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-gillis-municipality.sparql new file mode 100644 index 0000000..d532e54 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-gillis-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "7d3175ad-d4fc-4b56-a780-dab8e159c21d" ; + "Sint-Gillis" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "b93cd217-0c25-48f7-9751-b8723c6c1ac9" ; + ; + "Sint-Gillis" ; + "Sint-Gillis" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "3b113d58-a06b-428c-9ef6-36e7d354d299" . + + + a ; + "0207367588" ; + "12028344-1808-4ac1-81e0-443beaab6684" . + + + ; + a ; + "OVO-nummer" ; + "10f45315-05d9-409b-b7fd-b8f323ced0d2" . + + + a ; + "OVO025819" ; + "93b4be45-6225-42f3-b0d2-4a40a7741c25" . + + + a ; + "8749766d-e283-4145-8460-62360e278175" ; + ; + ; + . + + + a ; + "14df8707-b30f-478f-8e7a-e22b046bee49" ; + "contact.1060@stgilles.brussels" ; + "tel:+3225360211" ; + "Primary" ; + "https://stgillis.brussels/" . + + + a ; + "65e4a56c-123a-48a4-946e-be205ff69ed3" ; + "Sint-Gillis" ; + "België" ; + "39" ; + "Maurice Van Meenenplein 39, 1060 Sint-Gillis (bij-Brussel), België" ; + "1060" ; + "Maurice Van Meenenplein" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-jans-molenbeek-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-jans-molenbeek-municipality.sparql new file mode 100644 index 0000000..888571a --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-jans-molenbeek-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "07e8d443-2ebb-48ca-a7e4-d57c105db465" ; + "Sint-Jans-Molenbeek" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "11d024c8-1128-4764-bf85-b9732696d04d" ; + ; + "Sint-Jans-Molenbeek" ; + "Sint-Jans-Molenbeek" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "019c56fd-072c-4253-836d-e4b52142f4ee" . + + + a ; + "0207366501" ; + "bedb852c-3bb6-4ee7-8e9a-4b3e3a66a954" . + + + ; + a ; + "OVO-nummer" ; + "24a23c41-317e-466c-a177-5cbabccc08cf" . + + + a ; + "OVO025816" ; + "c0a0e2e8-cc64-4e8b-849c-b0b46509f705" . + + + a ; + "9aa004da-3abd-4c5b-9b36-194cf7fcb9de" ; + ; + ; + . + + + a ; + "18835ea3-c679-4718-86a7-674e399e9722" ; + "molenbeek@molenbeek.irisnet.be" ; + "tel:+3224123790" ; + "Primary" ; + "https://www.molenbeek.irisnet.be/" . + + + a ; + "7a692110-e4c3-4d00-9d65-8a2644ee34d3" ; + "Sint-Jans-Molenbeek" ; + "België" ; + "20" ; + "Graaf van Vlaanderenstraat 20, 1080 Sint-Jans-Molenbeek, België" ; + "1080" ; + "Graaf van Vlaanderenstraat" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-joost-ten-node-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-joost-ten-node-municipality.sparql new file mode 100644 index 0000000..18cd76f --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-joost-ten-node-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "430218c1-910d-4c19-abcf-7ad536f5e6d1" ; + "Sint-Joost-ten-Node" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "3a7e2441-e179-4514-9063-8f43700769f7" ; + ; + "Sint-Joost-ten-Node" ; + "Sint-Joost-ten-Node" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "8a6f1584-6cf8-4f00-94fa-0667f498e0df" . + + + a ; + "0207202193" ; + "072b23da-7ccb-4c98-a550-cfa9f6d57b5d" . + + + ; + a ; + "OVO-nummer" ; + "8f1176aa-52c7-4945-b7ab-743726904765" . + + + a ; + "OVO025814" ; + "b576e3f8-776b-4c3f-8584-5fb57d0ea45a" . + + + a ; + "ff6ab486-8622-4ace-ac7d-6a26780a06dc" ; + ; + ; + . + + + a ; + "ec65fdd4-d69f-4c63-af95-343f6acb38b7" ; + "info@sjtn.brussels" ; + "tel:+3222202611" ; + "Primary" ; + "https://www.sjtn.brussels/" . + + + a ; + "a6792559-ab56-4f9f-8124-49140ced25de" ; + "Sint-Joost-ten-Node" ; + "België" ; + "13" ; + "Sterrenkundelaan 13, 1210 Sint-Joost-ten-Node, België" ; + "1210" ; + "Sterrenkundelaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-lambrechts-woluwe-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-lambrechts-woluwe-municipality.sparql new file mode 100644 index 0000000..7f27338 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-lambrechts-woluwe-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "d6d937a1-aa1f-41fb-9e09-7ac80ad39a9a" ; + "Sint-Lambrechts-Woluwe" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "f5930a9e-3160-4f80-8134-460a847643af" ; + ; + "Sint-Lambrechts-Woluwe" ; + "Sint-Lambrechts-Woluwe" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "9557e115-77f3-42a8-84ad-16755ff51c30" . + + + a ; + "0207389859" ; + "819ffbde-7b29-475c-ae16-0c0337b0dbec" . + + + ; + a ; + "OVO-nummer" ; + "9dd47ba7-67b3-45da-a6b8-bf4d0a13d914" . + + + a ; + "OVO025823" ; + "fdd92962-b2a2-4680-858f-ee56cc88ffd2" . + + + a ; + "9dccf2e9-eec6-4a39-b39d-3836c3120330" ; + ; + ; + . + + + a ; + "1d4be53f-9247-46a9-a16b-e31756466183" ; + "infocom@woluwe1200.be" ; + "tel:+3227612711" ; + "Primary" ; + "https://www.woluwe1200.be/" . + + + a ; + "e9121d98-9a64-4da4-bcbb-36a20298d6d2" ; + "Sint-Lambrechts-Woluwe" ; + "België" ; + "2" ; + "Paul Hymanslaan 2, 1200 Sint-Lambrechts-Woluwe, België" ; + "1200" ; + "Paul Hymanslaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-pieters-woluwe-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-pieters-woluwe-municipality.sparql new file mode 100644 index 0000000..51c66ba --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-sint-pieters-woluwe-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "6fa36cc7-0e9a-4b8a-b285-443f52ffa989" ; + "Sint-Pieters-Woluwe" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "e327536c-f8ce-4138-b84c-2f9a8ce20912" ; + ; + "Sint-Pieters-Woluwe" ; + "Sint-Pieters-Woluwe" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "a4834fea-ab23-4447-b171-92f80c6481f3" . + + + a ; + "0207366994" ; + "439b0802-ac26-4750-829c-b542d0edf4f8" . + + + ; + a ; + "OVO-nummer" ; + "c137849b-184f-4845-b070-a45d467ae5ba" . + + + a ; + "OVO025817" ; + "e7a8f7da-e41e-4d02-ba89-5515dd96fad1" . + + + a ; + "a662844a-c476-4659-b070-fb633a11e294" ; + ; + ; + . + + + a ; + "7eea521a-6be9-472b-9cab-07e958bbcec0" ; + "info@woluwe1150.be" ; + "tel:+3227730511" ; + "Primary" ; + "https://www.woluwe1150.be/" . + + + a ; + "a1959366-e8d9-4378-8ee5-e446defde34c" ; + "Sint-Pieters-Woluwe" ; + "België" ; + "93" ; + "Charles Thielemanslaan 93, 1150 Sint-Pieters-Woluwe, België" ; + "1150" ; + "Charles Thielemanslaan" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ukkel-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ukkel-municipality.sparql new file mode 100644 index 0000000..567afe4 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-ukkel-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "4bd12290-8a0e-43c8-b308-500af066ae47" ; + "Ukkel" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "f020aef0-16f8-4de8-a37d-d51088b3db72" ; + ; + "Ukkel" ; + "Ukkel" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "e23d0e95-13f9-4a2d-b45b-e425d1aecf2c" . + + + a ; + "0207368875" ; + "da31d8dd-64fa-4978-8d4d-c3f1e4aaf209" . + + + ; + a ; + "OVO-nummer" ; + "ab742ed2-1d1c-482e-885e-2416efd7d346" . + + + a ; + "OVO025821" ; + "6306f2ff-b6ad-4b15-8b34-7b1cacfff6c7" . + + + a ; + "8f36d9b3-8ad9-4ec0-a22e-fb10096cc01f" ; + ; + ; + . + + + a ; + "6e54043b-79e4-4482-be24-047a64d013a7" ; + "secretariaat@ukkel.be" ; + "tel:+3223486511" ; + "Primary" ; + "https://www.ukkel.be" . + + + a ; + "54dacc64-d6e7-477b-a5c8-174ccf0dbcc3" ; + "Ukkel" ; + "België" ; + "77" ; + "Stallestraat 77, 1180 Ukkel, België" ; + "1180" ; + "Stallestraat" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-vorst-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-vorst-municipality.sparql new file mode 100644 index 0000000..801c28a --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-vorst-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "e84a58df-37f5-4b2b-bc0c-00f4658e87da" ; + "Vorst" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "b5f7fbe1-72b0-4908-aee1-716d0c2116c2" ; + ; + "Vorst" ; + "Vorst" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "0254289b-a981-4016-a47b-e094da4230b5" . + + + a ; + "0207367489" ; + "65471c13-b9df-4cf4-9cff-38948521413b" . + + + ; + a ; + "OVO-nummer" ; + "b02f2258-d89b-4d5f-9052-49fe79deb395" . + + + a ; + "OVO025818" ; + "b6827353-40ab-4b75-b60a-b705f5917f86" . + + + a ; + "41104d5e-5eea-47d3-aba3-680737890023" ; + ; + ; + . + + + a ; + "629515a1-4afd-4b5c-96f5-b6a25aba8034" ; + "contact@vorst.brussels" ; + "tel:+3223702211" ; + "Primary" ; + "https://vorst.brussels/" . + + + a ; + "72d4d8b8-70a6-428b-8a4e-1ab6039fca94" ; + "Vorst" ; + "België" ; + "2" ; + "Pastoorsstraat 2, 1190 Vorst, België" ; + "1190" ; + "Pastoorsstraat" . + } +} \ No newline at end of file diff --git a/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-watermaal-bosvoorde-municipality.sparql b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-watermaal-bosvoorde-municipality.sparql new file mode 100644 index 0000000..c99e6a3 --- /dev/null +++ b/config/migrations-triggering-indexing/2025/20251009123057-remove-province-for-address-in-brussels-gewest/20251009123057-insert-watermaal-bosvoorde-municipality.sparql @@ -0,0 +1,78 @@ +INSERT DATA { + GRAPH { + + a ; + "bc62f0ed-e116-467e-8951-7191f5766075" ; + "Watermaal-Bosvoorde" ; + "Gemeente" ; + . + } + + GRAPH { + + a , + , + ; + "573cbf00-13bd-473a-9ce9-fa13c2753101" ; + ; + "Watermaal-Bosvoorde" ; + "Watermaal-Bosvoorde" ; + . + } + + GRAPH { + + ; + ; + ; + ; + . + + + ; + a ; + "KBO nummer" ; + "37e09806-6e60-4fff-8099-beb908cdea63" . + + + a ; + "0207372637" ; + "f2fa6a01-5e44-4996-91d7-128004e74f48" . + + + ; + a ; + "OVO-nummer" ; + "1bbdd727-9902-4d07-a209-ea15ea8c0200" . + + + a ; + "OVO025822" ; + "84af9199-7355-41c3-896d-681b247af833" . + + + a ; + "54182a8a-6bf9-4e6e-9b14-6206979f16ea" ; + ; + ; + . + + + a ; + "01454978-bf23-43fa-9963-59ac9cf547b0" ; + "information@wb1170.brussels" ; + "tel:+3226747411" ; + "Primary" ; + "https://watermaal-bosvoorde.be/" . + + + a ; + "e9614c95-9f91-4773-afbb-2ab1f043eb33" ; + "Watermaal-Bosvoorde" ; + "België" ; + "1" ; + "Antoine Gilsonplein 1, 1170 Watermaal-Bosvoorde, België" ; + "1170" ; + "Antoine Gilsonplein" . + } +} \ No newline at end of file diff --git a/config/migrations/2025/20250904115406-add-dashboard-admin-role-to-mock-abb-user.sparql b/config/migrations/2025/20250904115406-add-dashboard-admin-role-to-mock-abb-user.sparql new file mode 100644 index 0000000..312405c --- /dev/null +++ b/config/migrations/2025/20250904115406-add-dashboard-admin-role-to-mock-abb-user.sparql @@ -0,0 +1,17 @@ +PREFIX foaf: +PREFIX ext: + +INSERT { + GRAPH ?g { + ?account ext:sessionRole "LoketLB-AdminDashboardOrganisatiePortaalGebruiker" . + } +} +WHERE { + VALUES ?account { + + } + + GRAPH ?g { + ?account ext:sessionRole ?role . + } +} diff --git a/config/search/config.json b/config/search/config.json index 95a016e..d15f2c6 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -654,6 +654,7 @@ "name": "http://www.w3.org/2004/02/skos/core#prefLabel", "legal_name": "http://www.w3.org/ns/regorg#legalName", "alternative_name": "http://www.w3.org/2004/02/skos/core#altLabel", + "source": "http://purl.org/dc/terms/source", "classification_id": [ "http://www.w3.org/ns/org#classification", "http://mu.semte.ch/vocabularies/core/uuid" @@ -723,6 +724,15 @@ } } }, + "source": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "classification_id": { "type": "text" }, diff --git a/config/tlsproxy-mock/Caddyfile b/config/tlsproxy-mock/Caddyfile index b041c33..a40c65b 100644 --- a/config/tlsproxy-mock/Caddyfile +++ b/config/tlsproxy-mock/Caddyfile @@ -1,4 +1,4 @@ -https://{$OP_ADDRESS} { +https://{$APPLICATION_ADDRESS} { reverse_proxy identifier:80 tls internal } diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 6ff8a35..3231ca2 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -40,6 +40,8 @@ services: restart: "no" login: restart: "no" + login-dashboard: + restart: "no" accountdetail: restart: "no" privacy-unit: @@ -50,6 +52,10 @@ services: restart: "no" frontend: restart: "no" + frontend-dashboard: + environment: + EMBER_LOGIN_ROUTE: "mock-login" + restart: "no" uri-info: restart: "no" delta-producer-background-jobs-initiator: diff --git a/docker-compose.yml b/docker-compose.yml index 4a44727..5e5dc8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -122,7 +122,7 @@ services: restart: always logging: *default-logging sink: - image: nginx:1.15.2 + image: nginx:1.25.1 volumes: - ./config/sink/sink.conf:/etc/nginx/conf.d/default.conf labels: @@ -130,7 +130,7 @@ services: restart: always logging: *default-logging login: - image: lblod/acmidm-login-service:0.9.2 + image: lblod/acmidm-login-service:0.12.0 environment: MU_APPLICATION_AUTH_USERID_CLAIM: "vo_id" MU_APPLICATION_GRAPH: "http://mu.semte.ch/graphs/contacthub/accounts" @@ -145,14 +145,22 @@ services: logging: *default-logging links: - db:database - dashboard-login: - image: semtech/mu-login-service:3.0.0 - links: - - db:database + login-dashboard: + image: lblod/acmidm-login-service:0.12.0 + environment: + LOG_SINK_URL: "http://sink" + MU_APPLICATION_AUTH_ROLE_CLAIM: "abb_organisatieportaal_rol_2d" + MU_APPLICATION_AUTH_USERID_CLAIM: "vo_id" + MU_APPLICATION_AUTH_DISCOVERY_URL: "" + MU_APPLICATION_AUTH_CLIENT_ID: "" + MU_APPLICATION_AUTH_REDIRECT_URI: "" + MU_APPLICATION_AUTH_CLIENT_SECRET: "" labels: - "logging=true" restart: always logging: *default-logging + links: + - db:database accountdetail: image: lblod/account-detail-service:0.1.0 labels: @@ -194,7 +202,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.34.0 + image: lblod/frontend-organization-portal:1.35.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: @@ -209,7 +217,15 @@ services: restart: always logging: *default-logging frontend-dashboard: - image: lblod/frontend-dashboard:1.7.0 + image: lblod/frontend-dashboard:1.10.0 + environment: + EMBER_LOGIN_ROUTE: "acmidm-login" + EMBER_ACMIDM_CLIENT_ID: "" + EMBER_ACMIDM_BASE_URL: "" + EMBER_ACMIDM_REDIRECT_URL: "" + EMBER_ACMIDM_LOGOUT_URL: "" + EMBER_ACMIDM_SCOPE: "openid vo profile abb_organisatieportaal" + EMBER_ENGLISH_ACCOUNTS_MODEL: true labels: - "logging=true" restart: always diff --git a/scripts/project/config.json b/scripts/project/config.json index 66a03a0..6e4cda6 100644 --- a/scripts/project/config.json +++ b/scripts/project/config.json @@ -48,21 +48,6 @@ "mounts": { "app": "/data/app/" } - }, - { - "documentation": { - "command": "generate-dashboard-login", - "description": "generate a login account for the jobs dashboard", - "arguments": [] - }, - "environment": { - "image": "ruby", - "interactive": true, - "script": "generate-dashboard-login/run.sh" - }, - "mounts": { - "app": "/project/" - } } ] -} \ No newline at end of file +} diff --git a/scripts/project/generate-dashboard-login/run.sh b/scripts/project/generate-dashboard-login/run.sh deleted file mode 100755 index 03f4aba..0000000 --- a/scripts/project/generate-dashboard-login/run.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env ruby -require 'bundler/inline' -require 'yaml' -require 'securerandom' -require 'date' - -$stdout.sync = true -print "installing dependencies..." -gemfile do - source 'https://rubygems.org' - gem 'bcrypt' -end -puts "done" - -salt = "" -begin - File.open("/project/docker-compose.override.yml") do |file| - config = YAML.load(file) - salt = config.dig("services", "dashboard-login", "environment", "MU_APPLICATION_SALT") - throw "invalid salt" unless salt - end -rescue - puts "Tried to locate login salt in docker-compose.override.yml, but couldn't find it." - puts "Please make sure a salt is configured:" - puts < -PREFIX people: -PREFIX accounts: -PREFIX dcterms: -PREFIX mu: -PREFIX ext: -PREFIX account: -PREFIX xsd: -INSERT DATA { - GRAPH { - people:#{person_uuid} a foaf:Person ; - foaf:name "#{account_name}"; - foaf:account accounts:#{account_uuid}; - mu:uuid "#{person_uuid}"; - dcterms:created "#{now}"^^xsd:datetime; - dcterms:modified "#{now}"^^xsd:datetime. - accounts:#{account_uuid} a foaf:OnlineAccount; - foaf:accountName "#{account_name}"; - mu:uuid "#{account_uuid}"; - account:password """#{hashed_password}"""; - account:salt "#{account_salt}"; - account:status ; - dcterms:created "#{now}"^^xsd:datetime; - ext:sessionRole "dashboard-user"; - dcterms:modified "#{now}"^^xsd:datetime. -}} -) - -timestamp = DateTime.now.strftime("%Y%m%d%H%M%L") -filename = "#{timestamp}-create-user-#{account_name.gsub(" ", "-")}.sparql" -File.write("/project/config/migrations/local/#{filename}", query) -puts "generated migration ./config/migrations/local/#{filename} for #{account_name.inspect} : #{password.inspect}" \ No newline at end of file