Merge branch 'develop' into 'v1.4.3'

# Conflicts:
#   composer.lock
This commit is contained in:
noah.lancien 2025-09-22 07:31:04 +00:00
commit 018e4911e2
4 changed files with 8 additions and 1 deletions

View file

@ -41,6 +41,7 @@ CONTACT_MAIL_COMMERCIAL=
CONTACT_MAIL_PRESSE=
CONTACT_MAIL_AUTRE=
CONTACT_MAIL_PAI=
CONTACT_MAIL_SAV=
# MATOMO
MATOMO_SITE_ID=

4
.gitignore vendored
View file

@ -13,6 +13,10 @@ public/wp
# Logs
*.log
.zshrc
.npm/
.composer/
.npmrc
# Dotenv
.env

View file

@ -39,6 +39,7 @@ Config::define('CONTACT_MAIL_COMMERCIAL', env('CONTACT_MAIL_COMMERCIAL'));
Config::define('CONTACT_MAIL_PRESSE', env('CONTACT_MAIL_PRESSE'));
Config::define('CONTACT_MAIL_AUTRE', env('CONTACT_MAIL_AUTRE'));
Config::define('CONTACT_MAIL_PAI', env('CONTACT_MAIL_PAI'));
Config::define('CONTACT_MAIL_SAV', env('CONTACT_MAIL_SAV'));
/**
* MATOMO ANALYTICS

View file

@ -34,6 +34,7 @@ data:
CONTACT_MAIL_PRESSE: "${APP_CONTACT_MAIL_PRESSE}"
CONTACT_MAIL_AUTRE: "${APP_CONTACT_MAIL_AUTRE}"
CONTACT_MAIL_PAI: "${APP_CONTACT_MAIL_PAI}"
CONTACT_MAIL_SAV: "${APP_CONTACT_MAIL_SAV}"
MATOMO_SITE_ID: "${APP_MATOMO_SITE_ID}"
LDCWEB_API_TOKEN: "${APP_LDCWEB_API_TOKEN}"
GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}"
@ -119,4 +120,4 @@ spec:
- name: redirect-no-www-to-www
namespace: common-services
tls:
secretName: ${CRT_TLS_NAME}
secretName: ${CRT_TLS_NAME}