Merge branch 'trunk'
This commit is contained in:
commit
d8103a5436
5 changed files with 1242 additions and 1177 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047
|
||||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:070426-150359
|
||||
COPY --chown=www-data:www-data . /app/srcs
|
||||
COPY --chown=www-data:www-data ./public/build /app/srcs/public/build
|
||||
COPY --chown=www-data:www-data ./vendor /app/srcs/vendor
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"description": "Website of Nature & Respect.",
|
||||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^8.3",
|
||||
"php": "^8.5",
|
||||
"codezero/laravel-localized-routes": "^4.0.1",
|
||||
"codezero/laravel-unique-translation": "^4.3.1",
|
||||
"diglactic/laravel-breadcrumbs": "^9.0.0",
|
||||
|
|
|
|||
2407
composer.lock
generated
2407
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -10,7 +10,7 @@ data:
|
|||
APP_DEBUG: "${APP_APP_DEBUG}"
|
||||
APP_URL: "https://${REDIRECT}${APP_DOMAIN}"
|
||||
LOG_CHANNEL: "k8s"
|
||||
DB_HOST: "mariadb.common-services"
|
||||
DB_HOST: "${APP_DB_HOST}"
|
||||
DB_DATABASE: "${APP_DB_DATABASE}"
|
||||
DB_USERNAME: "${APP_DB_USERNAME}"
|
||||
DB_PASSWORD: "${APP_DB_PASSWORD}"
|
||||
|
|
@ -124,6 +124,8 @@ metadata:
|
|||
name: ${CI_PROJECT_PATH_SLUG}-cronjob
|
||||
spec:
|
||||
schedule: "* * * * *"
|
||||
successfulJobsHistoryLimit: 1
|
||||
failedJobsHistoryLimit: 1
|
||||
concurrencyPolicy: Forbid
|
||||
jobTemplate:
|
||||
spec:
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@
|
|||
RewriteCond %{REQUEST_URI} (.+)/$
|
||||
RewriteRule ^ https://%{SERVER_NAME}%1 [L,R=301]
|
||||
|
||||
# Redirect /index.php/anything to /anything
|
||||
RewriteCond %{THE_REQUEST} /index\.php/([^\s?]*) [NC]
|
||||
RewriteRule ^index\.php/(.*)$ /$1 [L,R=301,NC]
|
||||
|
||||
# Send Requests To Front Controller...
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue