Merge branch 'develop' into trunk
This commit is contained in:
commit
84c770bd23
4 changed files with 15 additions and 10 deletions
|
|
@ -43,8 +43,12 @@ GOOGLE_RECAPTCHA_PUBLIC=
|
|||
GOOGLE_RECAPTCHA_PRIVATE=
|
||||
GOOGLE_RECAPTCHA_VERSION=
|
||||
|
||||
# LDC Web Admin Secure
|
||||
LDC_WEB_API_KEY="MY_KEY"
|
||||
# UWIL ADMIN SECURE
|
||||
# - LIST SEPARATED WITH ',' (Required)
|
||||
UWIL_ADMIN_SECURE_CIDR_LIST=""
|
||||
# - LIST SEPARATED WITH ',' (Optional)
|
||||
UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST=""
|
||||
|
||||
|
||||
# SAML
|
||||
SAML2_DEFAULT_TENANT_UUID=
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
"propaganistas/laravel-phone": "^5.0.3",
|
||||
"sentry/sentry-laravel": "^4.9",
|
||||
"spatie/calendar-links": "^1.8.5",
|
||||
"uwil/admin-secure-laravel": "*",
|
||||
"uwil/admin-secure-laravel": "^5.0",
|
||||
"uwil/k8s-laravel": "^1.2",
|
||||
"uwil/laravel-common": "^2.0",
|
||||
"uwil/laravel-redirections": "^2.0",
|
||||
|
|
|
|||
12
composer.lock
generated
12
composer.lock
generated
|
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "8bd488d5af08f4f258b2ba2bdd2d8aa6",
|
||||
"content-hash": "68a6e4f5ca175fb422376bbcf2488861",
|
||||
"packages": [
|
||||
{
|
||||
"name": "24slides/laravel-saml2",
|
||||
|
|
@ -8527,16 +8527,16 @@
|
|||
},
|
||||
{
|
||||
"name": "uwil/admin-secure-laravel",
|
||||
"version": "4.0.0",
|
||||
"version": "5.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@lab.s-web.fr:ldc-web/projets/ldc-web-admin-secure-laravel.git",
|
||||
"reference": "26f818b6b9251090fa5960a40750716e4fdbbe9d"
|
||||
"reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=26f818b6b9251090fa5960a40750716e4fdbbe9d",
|
||||
"reference": "26f818b6b9251090fa5960a40750716e4fdbbe9d",
|
||||
"url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=7d9c052db4318752a312dc9763bc8c31ea053aa2",
|
||||
"reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -8585,7 +8585,7 @@
|
|||
],
|
||||
"description": "Restrict access to LDC Network",
|
||||
"support": {
|
||||
"email": "equipe.web@ldc.fr",
|
||||
"email": "digital@ldc.fr",
|
||||
"issues": "https://lab.s-web.fr/ldc-web/projets/ldc-web-admin-secure-laravel/-/issues"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ data:
|
|||
MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}"
|
||||
MAIL_FROM_NAME: "${APP_APP_NAME}"
|
||||
MAIL_LIST_CONTACTFORM: "${APP_MAIL_LIST_CONTACTFORM}"
|
||||
LDC_WEB_API_KEY: "${APP_LDC_WEB_API_KEY}"
|
||||
GOOGLE_RECAPTCHA_PRIVATE: "${APP_GOOGLE_RECAPTCHA_PRIVATE}"
|
||||
GOOGLE_RECAPTCHA_PUBLIC: "${APP_GOOGLE_RECAPTCHA_PUBLIC}"
|
||||
GOOGLE_RECAPTCHA_VERSION: "${APP_GOOGLE_RECAPTCHA_VERSION}"
|
||||
|
|
@ -36,6 +35,8 @@ data:
|
|||
CRM_ENDPOINT: "${APP_CRM_ENDPOINT}"
|
||||
CRM_PASSWORD: "${APP_CRM_PASSWORD}"
|
||||
CRM_TOKEN: "${APP_CRM_TOKEN}"
|
||||
UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}"
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue