handle traefik_install variables, and set default values for each chill configuration

This commit is contained in:
2026-01-20 16:33:32 +01:00
parent f545970f05
commit 64d0a63e68
6 changed files with 105 additions and 62 deletions
+27 -14
View File
@@ -2,42 +2,51 @@
services:
frontend:
image: {{ registry_url }}/{{ registry_project }}/{{ chill_image_nginx_name }}:{{ item.chill_image_tag }}
image: {{ registry_url }}/{{ registry_project }}/{{ chill_image_nginx_name }}:{{ chill.chill_image_tag }}
links:
- app:php
{% if traefik_install %}
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
- "traefik.http.routers.frontend-{{ item.chill_environment }}.rule=Host(`{{ item.host }}`)"
- "traefik.http.routers.frontend-{{ item.chill_environment }}.entrypoints=websecure"
{%+ if item.tls_config == 'self_signed' +%}
- "traefik.http.routers.frontend-{{ item.chill_environment }}.tls=true"
- "traefik.http.routers.frontend-{{ chill.chill_environment }}.rule=Host(`{{ chill.host }}`)"
- "traefik.http.routers.frontend-{{ chill.chill_environment }}.entrypoints=websecure"
{%+ if chill.tls_config == 'self_signed' +%}
- "traefik.http.routers.frontend-{{ chill.chill_environment }}.tls=true"
{%+ endif +%}
{%+ if item.expose_port is not false +%}
- "traefik.http.routers.frontend-exp-{{ item.chill_environment }}.rule=PathPrefix(`/`)"
- "traefik.http.routers.frontend-exp-{{ item.chill_environment }}.entrypoints=chill{{ item.chill_environment }}"
{%+ if item.tls_config == 'self_signed' +%}
- "traefik.http.routers.frontend-exp-{{ item.chill_environment }}.tls=true"
{%+ if chill.expose_port is not false +%}
- "traefik.http.routers.frontend-exp-{{ chill.chill_environment }}.rule=PathPrefix(`/`)"
- "traefik.http.routers.frontend-exp-{{ chill.chill_environment }}.entrypoints=chill{{ chill.chill_environment }}"
{%+ if chill.tls_config == 'self_signed' +%}
- "traefik.http.routers.frontend-exp-{{ chill.chill_environment }}.tls=true"
{%+ endif +%}
{%+ endif +%}
{% endif %}
networks:
{% if traefik_install %}
- traefik
{% endif %}
- default
restart: always
app: &defaultApp
image: {{ registry_url }}/{{ registry_project }}/{{ chill_image_php_name }}:{{ item.chill_image_tag }}
image: {{ registry_url }}/{{ registry_project }}/{{ chill_image_php_name }}:{{ chill.chill_image_tag }}
env_file:
- env_file.env
volumes:
- './config/prod:/var/www/app/config/packages/prod:ro'
- '/var/log/chill:/var/www/app/var/log:rw'
- '{{ doc_storage_dir }}/{{ item['chill_environment'] }}:/var/storage:rw'
- '{{ doc_storage_dir }}/{{ chill['chill_environment'] }}:/var/storage:rw'
links:
- redis
- relatorio
- rabbitmq
{% if item.add_postgres -%}
{% if chill.add_postgres -%}
- database
{%- endif %}
@@ -71,7 +80,7 @@ services:
command: ["bin/console", "chill:cron-job:execute", "-v"]
restart: "no"
{% if item.add_postgres %}
{% if chill.add_postgres %}
database:
image: "{{ database_image }}"
@@ -137,6 +146,10 @@ services:
restart: always
networks:
{% if traefik_install %}
traefik:
external: true
{% endif %}
default:
+28 -27
View File
@@ -8,39 +8,40 @@ REDIS_PORT=6379
REDIS_URL=redis://redis:6379
RELATORIO_HOST=relatorio
RELATORIO_PORT=8888
TRUSTED_HOSTS={{ item.chill_config.trusted_hosts }}
DATABASE_HOST={{ item.chill_config.database_host }}
DATABASE_PORT={{ item.chill_config.database_port }}
DATABASE_NAME={{ item.chill_config.database_name }}
DATABASE_USER={{ item.chill_config.database_user }}
DATABASE_VERSION={{ item.chill_config.database_version }}
TRUSTED_HOSTS={{ chill.chill_config.trusted_hosts }}
DATABASE_HOST={{ chill.chill_config.database_host }}
DATABASE_PORT={{ chill.chill_config.database_port }}
DATABASE_NAME={{ chill.chill_config.database_name }}
DATABASE_USER={{ chill.chill_config.database_user }}
DATABASE_VERSION={{ chill.chill_config.database_version }}
LOCALE=fr
MAILER_PROTOCOL=smtp
MAILER_USER={{ item.chill_config.mailer_user }}
MAILER_HOST={{ item.chill_config.mailer_host }}
MAILER_PORT={{ item.chill_config.mailer_port }}
NOTIFICATION_HOST={{ item.chill_config.notification_host }}
NOTIFICATION_FROM_EMAIL={{ item.chill_config.notification_from_email }}
MAILER_USER={{ chill.chill_config.mailer_user }}
MAILER_HOST={{ chill.chill_config.mailer_host }}
MAILER_PORT={{ chill.chill_config.mailer_port }}
NOTIFICATION_HOST={{ chill.chill_config.notification_host }}
NOTIFICATION_FROM_EMAIL={{ chill.chill_config.notification_from_email }}
ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
ASYNC_UPLOAD_TEMP_URL_CONTAINER=
ASYNC_UPLOAD_TEMP_URL_KEY=
DEFAULT_CARRIER_CODE=FR
APP_SECRET={{ item.chill_config.app_secret }}
ADMIN_PASSWORD={{ item.chill_config.admin_password }}
{% if item.chill_config.admin_password_1 is defined -%}
ADMIN_PASSWORD_1={{ item.chill_config.admin_password_1 }}
APP_SECRET={{ chill.chill_config.app_secret }}
ADMIN_PASSWORD={{ chill.chill_config.admin_password }}
{% if chill.chill_config.admin_password_1 is defined -%}
ADMIN_PASSWORD_1={{ chill.chill_config.admin_password_1 }}
{% endif -%}
{% if item.chill_config.admin_password_2 is defined -%}
ADMIN_PASSWORD_2={{ item.chill_config.admin_password_2 }}
{% if chill.chill_config.admin_password_2 is defined -%}
ADMIN_PASSWORD_2={{ chill.chill_config.admin_password_2 }}
{% endif -%}
{% if item.chill_config.admin_password_3 is defined -%}
ADMIN_PASSWORD_3={{ item.chill_config.admin_password_3 }}
{% if chill.chill_config.admin_password_3 is defined -%}
ADMIN_PASSWORD_3={{ chill.chill_config.admin_password_3 }}
{% endif -%}
MAILER_DSN={{ item.chill_config.mailer_dsn }}
MAILER_URL={{ item.chill_config.mailer_url }}
JWT_PASSPHRASE={{ item.chill_config.jwt_passphrase }}
JWT_SECRET_KEY={{ item.chill_config.jwt_secret_key }}
JWT_PUBLIC_KEY={{ item.chill_config.jwt_public_key }}
RABBITMQ_URL=amqp://{{ item.chill_config.rabbitmq_user }}:{{ item.chill_config.rabbitmq_password }}@rabbitmq/%2f
DATABASE_URL=postgres://{{ item.chill_config.database_user }}:{{ item.chill_config.database_password }}@{% if item.add_postgres %}database:5432{% else %}{{ item.chill_config.database_host }}{% endif %}/{{ item.chill_config.database_name }}?sslmode=prefer&charset=utf8&serverVersion={{ item.chill_config.database_version }}
EDITOR_SERVER={{ item.chill_config.editor_server }}
MAILER_DSN={{ chill.chill_config.mailer_dsn }}
MAILER_URL={{ chill.chill_config.mailer_url }}
JWT_PASSPHRASE={{ chill.chill_config.jwt_passphrase }}
JWT_SECRET_KEY={{ chill.chill_config.jwt_secret_key }}
JWT_PUBLIC_KEY={{ chill.chill_config.jwt_public_key }}
RABBITMQ_URL=amqp://{{ chill.chill_config.rabbitmq_user }}:{{ chill.chill_config.rabbitmq_password }}@rabbitmq/%2f
DATABASE_URL=postgres://{{ chill.chill_config.database_user }}:{{ chill.chill_config.database_password }}@{% if chill.add_postgres %}database:5432{% else %}{{ chill.chill_config.database_host }}{% endif %}/{{ chill.chill_config.database_name }}?sslmode=prefer&charset=utf8&serverVersion={{ chill.chill_config.database_version }}
EDITOR_SERVER={{ chill.chill_config.editor_server }}
OVHCLOUD_DSN={{ chill.chill_config.ovhcloud_dsn }}