Merge branch 'trunk'
This commit is contained in:
commit
dd288b5770
4 changed files with 7 additions and 5 deletions
|
|
@ -40,6 +40,7 @@ CONTACT_MAIL_RECRUTEMENT=
|
|||
CONTACT_MAIL_COMMERCIAL=
|
||||
CONTACT_MAIL_PRESSE=
|
||||
CONTACT_MAIL_AUTRE=
|
||||
CONTACT_MAIL_PAI=
|
||||
|
||||
# MATOMO
|
||||
MATOMO_SITE_ID=
|
||||
|
|
|
|||
8
composer.lock
generated
8
composer.lock
generated
|
|
@ -1045,16 +1045,16 @@
|
|||
},
|
||||
{
|
||||
"name": "uwil/sbv-theme",
|
||||
"version": "1.1.11",
|
||||
"version": "1.1.12",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@lab.s-web.fr:ldc-web/projets/sbv-theme.git",
|
||||
"reference": "86e37802a0b790ad344aeb5b2ca4f52a5ebdf1c4"
|
||||
"reference": "93fc0da7cefe534a9e28cb2d76cc871a7b7e92a2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=86e37802a0b790ad344aeb5b2ca4f52a5ebdf1c4",
|
||||
"reference": "86e37802a0b790ad344aeb5b2ca4f52a5ebdf1c4",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/153/packages/composer/archives/uwil/sbv-theme.zip?sha=93fc0da7cefe534a9e28cb2d76cc871a7b7e92a2",
|
||||
"reference": "93fc0da7cefe534a9e28cb2d76cc871a7b7e92a2",
|
||||
"shasum": ""
|
||||
},
|
||||
"type": "wordpress-theme",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ Config::define('CONTACT_MAIL_RECRUTEMENT', env('CONTACT_MAIL_RECRUTEMENT'));
|
|||
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'));
|
||||
|
||||
/**
|
||||
* MATOMO ANALYTICS
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ data:
|
|||
CONTACT_MAIL_COMMERCIAL: "${APP_CONTACT_MAIL_COMMERCIAL}"
|
||||
CONTACT_MAIL_PRESSE: "${APP_CONTACT_MAIL_PRESSE}"
|
||||
CONTACT_MAIL_AUTRE: "${APP_CONTACT_MAIL_AUTRE}"
|
||||
CONTACT_MAIL_PAI: "${APP_CONTACT_MAIL_PAI}"
|
||||
MATOMO_SITE_ID: "${APP_MATOMO_SITE_ID}"
|
||||
LDCWEB_API_TOKEN: "${APP_LDCWEB_API_TOKEN}"
|
||||
GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}"
|
||||
|
|
@ -87,7 +88,6 @@ spec:
|
|||
persistentVolumeClaim:
|
||||
claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
|
||||
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue