wait #7168 @4

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index b347aefd5bcce0b289b583e55a43ce3e8ab8047a..39cac636294670958b3bc147e1ed0d6e48bdbd94 100644 (file)
--- 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 2d94bc743536388137674696812488ae77a6c5df..aba00f347bb61342ed4063d2d7875374856d2ff6 100644 (file)
--- 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 3ec3dac98bc8bf11cd24ecd5f6e44ebb80f37523..fbcbeca672b6affe733a16ef682599d78fbf7f9c 100644 (file)
--- 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 407dbcdfac8372dd66284fc80ecd175fcc93e639..7b0645d141452bb7c53f7e1fece649c267e7f7bc 100644 (file)
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -30,23 +30,23 @@
     <link href="https://fonts.googleapis.com/css2?family=Anton&family=Cormorant+Garamond&family=EB+Garamond:ital,wght@0,400;0,700;1,400&family=Hind:wght@400;700&family=Quicksand:wght@400;700&display=swap" rel="stylesheet">
 
     @if(app()->isProduction())
-        <link rel="apple-touch-icon" sizes="180x180" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/favicon-16x16.png">
-        <link rel="manifest" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/site.webmanifest">
-        <link rel="mask-icon" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/safari-pinned-tab.svg" color="#5bbad5">
-        <link rel="shortcut icon" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/favicon.ico">
+        <link rel="apple-touch-icon" sizes="180x180" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/favicon-16x16.png">
+        <link rel="manifest" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/site.webmanifest">
+        <link rel="mask-icon" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/safari-pinned-tab.svg" color="#5bbad5">
+        <link rel="shortcut icon" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/favicon.ico">
         <meta name="msapplication-TileColor" content="#2b5797">
-        <meta name="msapplication-config" content="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/prod/browserconfig.xml">
+        <meta name="msapplication-config" content="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/prod/browserconfig.xml">
         <meta name="theme-color" content="#ffffff">
     @else
-        <link rel="apple-touch-icon" sizes="180x180" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/favicon-16x16.png">
-        <link rel="manifest" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/site.webmanifest">
-        <link rel="shortcut icon" href="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/favicon.ico">
+        <link rel="apple-touch-icon" sizes="180x180" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/favicon-16x16.png">
+        <link rel="manifest" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/site.webmanifest">
+        <link rel="shortcut icon" href="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/favicon.ico">
         <meta name="msapplication-TileColor" content="#9f00a7">
-        <meta name="msapplication-config" content="https://prescription-sante.s3.eu-west-3.amazonaws.com/public/favicon/local-web/browserconfig.xml">
+        <meta name="msapplication-config" content="{{config('filesystems.disks.s3.endpoint')}}/public/favicon/local-web/browserconfig.xml">
         <meta name="theme-color" content="#ffffff">
     @endif