diff --git a/angular.json b/angular.json index cebdb5d5b17458bb3b923159f46e258c963214fe..17ca42ce4b47b619c4f24742fdf1a7e35725dc12 100644 --- a/angular.json +++ b/angular.json @@ -39,6 +39,7 @@ "assets": [ "src/favicon.ico", "src/assets", + "src/config/config.json", "src/sitemap.xml", "src/robots.txt", "src/ngsw-worker.js", diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 3857c5e284e1195edea920277581ccec4647fa60..d61b0c35caa739284f80dfb42296d0186726575a 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -7,7 +7,7 @@ services: image: registry.forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client:${TAG} volumes: - ./nginx/local.conf:/etc/nginx/conf.d/default.conf - - ./src/assets/config.json:/usr/share/nginx/html/assets/config.json + - ./src/config/config.json:/usr/share/nginx/html/config/config.json ports: - 8030:8080 extra_hosts: diff --git a/docker-compose.yml b/docker-compose.yml index 12192986b3c846d84a4acd8abc377bcfe5d52aed..8cf8c152ae6e999da78660ba5a0b9ea27b378c09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,6 @@ services: image: registry.forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client:${TAG} volumes: - ./dev.conf:/etc/nginx/conf.d/default.conf - - ./config.json:/usr/share/nginx/html/assets/config.json + - ./config.json:/usr/share/nginx/html/config/config.json ports: - 8030:8080 diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 36b35b928d3c68634135e95cfcc7e49e0afc5299..b0caadecb9749bef28bd07e8af9f006cc0de19e7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -81,7 +81,7 @@ import { StructureJoinComponent } from './structure/structure-join/structure-joi ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production, }), - RuntimeConfigLoaderModule, + RuntimeConfigLoaderModule.forRoot({ configUrl: './config/config.json' }), NgxMatomoTrackerModule.forRoot({ mode: MatomoInitializationMode.AUTO_DEFERRED }), NgxMatomoRouterModule, ], diff --git a/src/assets/config.json b/src/config/config.json similarity index 100% rename from src/assets/config.json rename to src/config/config.json diff --git a/src/assets/config.template.json b/src/config/config.template.json similarity index 100% rename from src/assets/config.template.json rename to src/config/config.template.json