forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Noah Lancien 2026-01-12 09:32:32 +01:00
commit ea41e19724
4 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.env.example
View file

@ -36,13 +36,11 @@ MAIL_ADMIN=digital@ldc.fr
# Sentry
SENTRY_LARAVEL_DSN=
# ADMIN SECURE
# - API ENDPOINT (Optional)
LDC_WEB_API_ENDPOINT=
# - API KEY
LDC_WEB_API_KEY=
# UWIL ADMIN SECURE
# - LIST SEPARATED WITH ',' (Required)
UWIL_ADMIN_SECURE_CIDR_LIST=""
# - LIST SEPARATED WITH ',' (Optional)
LDC_WEB_CIDR_MANUAL_ALLOWED_LIST=
UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST=
# GITLAB API
GITLAB_URL=

2
composer.json
View file

@ -24,7 +24,7 @@
"laravel/ui": "^4.2",
"mews/purifier": "^3.4",
"sentry/sentry-laravel": "*",
"uwil/admin-secure-laravel": "^3.0",
"uwil/admin-secure-laravel": "^5.0",
"uwil/k8s-laravel": "^1.2"
},
"require-dev": {

33
composer.lock generated
View file

@ -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": "e7bf9833354cd32d54b40e311c64f916",
"content-hash": "008a506f2fa05557c7cf5c270f44b7eb",
"packages": [
{
"name": "brick/math",
@ -8641,22 +8641,22 @@
},
{
"name": "uwil/admin-secure-laravel",
"version": "3.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": "6bf17bd7a45b2bdc3a86cef381a86e77bc339469"
"reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=6bf17bd7a45b2bdc3a86cef381a86e77bc339469",
"reference": "6bf17bd7a45b2bdc3a86cef381a86e77bc339469",
"url": "https://lab.s-web.fr/api/v4/projects/20/packages/composer/archives/uwil/admin-secure-laravel.zip?sha=7d9c052db4318752a312dc9763bc8c31ea053aa2",
"reference": "7d9c052db4318752a312dc9763bc8c31ea053aa2",
"shasum": ""
},
"require": {
"dxw/cidr": "^3.2",
"illuminate/support": "~11",
"laravel/framework": "~11",
"illuminate/support": "~11|~12",
"laravel/framework": "~11|~12",
"php": "^8.3",
"symfony/options-resolver": "^7.0"
},
@ -8697,14 +8697,11 @@
"license": [
"MIT"
],
"authors": [
{
"name": "Equipe Web",
"email": "digital@ldc.fr",
"homepage": "https://www.ldc.fr"
}
],
"description": "Restrict access to LDC Network"
"description": "Restrict access to LDC Network",
"support": {
"email": "digital@ldc.fr",
"issues": "https://lab.s-web.fr/ldc-web/projets/ldc-web-admin-secure-laravel/-/issues"
}
},
{
"name": "uwil/k8s-laravel",
@ -12593,12 +12590,12 @@
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {},
"stability-flags": [],
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^8.3"
},
"platform-dev": {},
"plugin-api-version": "2.9.0"
"platform-dev": [],
"plugin-api-version": "2.3.0"
}

8
manifest.yaml
View file

@ -26,6 +26,7 @@ data:
SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}"
GITLAB_URL: "https://${CI_SERVER_HOST}"
GITLAB_TOKEN: "${APP_GITLAB_TOKEN}"
UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}"
---
apiVersion: v1
@ -61,6 +62,13 @@ spec:
envFrom:
- configMapRef:
name: ${CI_PROJECT_PATH_SLUG}-config-map
resources:
limits:
cpu: "${APP_CI_CPU_LIMIT}"
memory: "${APP_CI_MEMORY_LIMIT}"
requests:
cpu: "${APP_CI_CPU_REQUEST}"
memory: "${APP_CI_MEMORY_REQUEST}"
volumeMounts:
- name: storage
mountPath: /app/srcs/storage