From 1a437c616490728fd31179831f20079ff6c275fa Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 7 Nov 2024 11:40:39 +0100 Subject: [PATCH] wait #7168 @4 --- .docker/production/docker-compose.yml | 18 ++++++++++++++++-- .env.production | 23 +++++++++++++++-------- config/filesystems.php | 1 + resources/views/layouts/app.blade.php | 26 +++++++++++++------------- 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml index b347aef..39cac63 100644 --- a/.docker/production/docker-compose.yml +++ b/.docker/production/docker-compose.yml @@ -60,8 +60,6 @@ services: image: 'minio/minio:latest' container_name: presquot-s3 environment: -# VIRTUAL_HOST: s3.presquot.dev.cubedesigners.com -# VIRTUAL_PORT: 8900 VIRTUAL_HOST_MULTIPORTS: |- s3.presquot.dev.cubedesigners.com: "/": @@ -142,6 +140,22 @@ services: - presquot restart: unless-stopped + mailtrap: + container_name: presquot-mailtrap + image: dbck/mailtrap:latest + environment: + TZ: Europe/Paris + VIRTUAL_HOST: mailtrap.presquot.dev.cubedesigners.com + LETSENCRYPT_HOST: mailtrap.presquot.dev.cubedesigners.com + MAILTRAP_USER: mailtrap + MAILTRAP_PASSWORD: zbtJogUNGZdglt3rg7qL + MAILTRAP_MAILBOX_LIMIT: 51200000 + MAILTRAP_MESSAGE_LIMIT: 10240000 + MAILTRAP_MAX_RECIPIENT_LIMIT: 1000 + networks: + - presquot + restart: unless-stopped + networks: presquot: external: diff --git a/.env.production b/.env.production index 2d94bc7..aba00f3 100644 --- a/.env.production +++ b/.env.production @@ -31,18 +31,25 @@ REDIS_PORT=6379 #REDIS_QUEUE_DB=4 MAIL_MAILER=smtp -MAIL_HOST=sandbox.smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=ed41ffba0668d4 -MAIL_PASSWORD=1aea6e734b2ec0 -MAIL_ENCRYPTION=tls +MAIL_HOST=prequot-mailtrap +MAIL_PORT=25 +MAIL_USERNAME=mailtrap +MAIL_PASSWORD=zbtJogUNGZdglt3rg7qL #MAIL_FROM_ADDRESS=noreply@email.prescription-quotidien.com #MAIL_FROM_NAME="Prescription Santé - Le Quotidien" -AWS_ACCESS_KEY_ID=AKIAZYI53ESTDP6BLEWY -AWS_SECRET_ACCESS_KEY=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 +#AWS_ACCESS_KEY_ID=AKIAZYI53ESTDP6BLEWY +#AWS_SECRET_ACCESS_KEY=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 +#AWS_DEFAULT_REGION=eu-west-3 +#AWS_BUCKET=prescription-sante +#AWS_USE_PATH_STYLE_ENDPOINT=false + +AWS_URL=https://s3.presquot.dev.cubedesigners.com/ +AWS_ACCESS_KEY_ID=gKlQWBg3amQ71lJMM6MF +AWS_SECRET_ACCESS_KEY=cRhF1qIUTkz5ZedVcwzJXNyXKRQTleBXltVDazNp AWS_DEFAULT_REGION=eu-west-3 -AWS_BUCKET=prescription-sante +AWS_BUCKET=presquot +AWS_USE_PATH_STYLE_ENDPOINT=true PUSHER_APP_ID=977841 PUSHER_APP_KEY=459380cb6d0a29d6861f diff --git a/config/filesystems.php b/config/filesystems.php index 3ec3dac..fbcbeca 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -62,6 +62,7 @@ return [ 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), 'endpoint' => env('AWS_URL'), + 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT'), ], ], diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 407dbcd..7b0645d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -30,23 +30,23 @@ @if(app()->isProduction()) - - - - - - + + + + + + - + @else - - - - - + + + + + - + @endif -- 2.39.5