diff --git a/.env b/.env index d2f0c4c3..dc31d8a8 100644 --- a/.env +++ b/.env @@ -45,6 +45,7 @@ ORGANIZATION_UNIT_NAME=Common-Ground ################################################## APP_DOMAIN=conduction.nl +APP_DOMAINS=["conduction.nl","zaakonline.nl","larping.eu","common-ground.dev","trouwplanner.online","huwelijksplanner.online"] APP_DEMO=pc.zaakonline.nl APP_REPRO=https://github.com/ConductionNL/Proto-component-commonground diff --git a/api/config/packages/twig.yaml b/api/config/packages/twig.yaml index 26f06175..ee6c1853 100644 --- a/api/config/packages/twig.yaml +++ b/api/config/packages/twig.yaml @@ -1,3 +1,13 @@ +parameters: + env(APP_DOMAINS): '[]' + # Organisation stuff + env(ORGANIZATION_NAME): '' + env(ORGANIZATION_EMAIL_ADDRESS): '' + env(ORGANIZATION_COUNTRY_NAME): '' + env(ORGANIZATION_STATE): '' + env(ORGANIZATION_LOCALITY): '' + env(ORGANIZATION_UNIT_NAME): '' + twig: default_path: '%kernel.project_dir%/templates' debug: '%kernel.debug%' @@ -22,6 +32,7 @@ twig: app_env: '%env(APP_ENV)%' app_debug: '%env(APP_DEBUG)%' app_domain: '%env(APP_DOMAIN)%' + app_domains: '%env(json:APP_DOMAINS)%' app_demo: '%env(APP_DEMO)%' app_repro: '%env(APP_REPRO)%' app_description: '%env(APP_DESCRIPTION)%' diff --git a/api/helm/values.yaml b/api/helm/values.yaml index 18c2d9e3..93067cb8 100644 --- a/api/helm/values.yaml +++ b/api/helm/values.yaml @@ -11,6 +11,13 @@ settings: description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.'' repro: 'https://github.com/ConductionNL/Proto-component-commonground' domain: conduction.nl + domains: + - conduction.nl + - zaakonline.nl + - larping.eu + - common-ground.dev + - trouwplanner.online + - huwelijksplanner.online organisationName: Conduction email: info@conduction.nl country: Netherlands diff --git a/api/templates/helm/Values.yaml.twig b/api/templates/helm/Values.yaml.twig index 37ec6129..aade15ab 100644 --- a/api/templates/helm/Values.yaml.twig +++ b/api/templates/helm/Values.yaml.twig @@ -11,6 +11,10 @@ settings: description: '{{ app_description }}' repro: '{{ app_repro }}' domain: {{ app_domain }} + domains: +{% for domain in app_domains %} + - {{ domain }} +{% endfor %} organisationName: {{ organization_name }} email: {{ organization_email }} country: {{ organization_country }} diff --git a/docker-compose.yml b/docker-compose.yml index 4d7436b7..3c8a82c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,7 @@ services: - APP_NAME=${APP_NAME} - APP_TITLE=${APP_TITLE} - APP_DOMAIN=${APP_DOMAIN} + - APP_DOMAINS=${APP_DOMAINS} - APP_DEMO=${APP_DEMO} - APP_REPRO=${APP_REPRO} - APP_DESCRIPTION=${APP_DESCRIPTION}