wip #8023 @3

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index 6559a3991873e77de3965ffe1740882772047289..baa4313f6b7d908ff6990c50ce272c0472b102fb 100644 (file)
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
   webserver:
     container_name: presquot-httpd
@@ -13,8 +12,8 @@ services:
       - './www/storage/s3/public/:/usr/local/apache2/htdocs/s3/'
       - './www/storage/s3/public/:/application/public/s3/'
     environment:
-      VIRTUAL_HOST: admin.dev.prescription-quotidien.com,dev.prescription-quotidien.com
-      LETSENCRYPT_HOST: admin.dev.prescription-quotidien.com,dev.prescription-quotidien.com
+      VIRTUAL_HOST: admin.prescription-quotidien.com,prescription-quotidien.com,www.prescription-quotidien.com
+      LETSENCRYPT_HOST: admin.prescription-quotidien.com,prescription-quotidien.com,www.prescription-quotidien.com
     networks:
       - presquot
       - nginxproxy
@@ -67,27 +66,27 @@ services:
       - presquot
     restart: unless-stopped
 
-  minio:
-    image: 'minio/minio:latest'
-    container_name: presquot-s3
-    environment:
-      VIRTUAL_HOST_MULTIPORTS: |-
-        s3.dev.prescription-quotidien.com:
-          "/":
-            port: 9000
-        console.s3.dev.prescription-quotidien.com:
-          "/":
-            port: 8900
-      LETSENCRYPT_HOST: s3.dev.prescription-quotidien.com,console.s3.dev.prescription-quotidien.com
-      MINIO_ROOT_USER: root
-      MINIO_ROOT_PASSWORD: jH3zZm5TjX7cg4Lomt6N
-    volumes:
-      - './s3:/data/minio'
-    command: 'minio server /data/minio --console-address ":8900"'
-    networks:
-      - presquot
-      - nginxproxy
-    restart: unless-stopped
+#  minio:
+#    image: 'minio/minio:latest'
+#    container_name: presquot-s3
+#    environment:
+#      VIRTUAL_HOST_MULTIPORTS: |-
+#        s3.dev.prescription-quotidien.com:
+#          "/":
+#            port: 9000
+#        console.s3.dev.prescription-quotidien.com:
+#          "/":
+#            port: 8900
+#      LETSENCRYPT_HOST: s3.dev.prescription-quotidien.com,console.s3.dev.prescription-quotidien.com
+#      MINIO_ROOT_USER: root
+#      MINIO_ROOT_PASSWORD: jH3zZm5TjX7cg4Lomt6N
+#    volumes:
+#      - './s3:/data/minio'
+#    command: 'minio server /data/minio --console-address ":8900"'
+#    networks:
+#      - presquot
+#      - nginxproxy
+#    restart: unless-stopped
 
   adminer:
     image: 'adminer'
@@ -99,8 +98,8 @@ services:
       - "./www/.docker/config/adminer/php.ini:/usr/local/etc/php/conf.d/99-adminer.ini"
     environment:
       ADMINER_DEFAULT_SERVER: presquot-mariadb
-      VIRTUAL_HOST: adminer.dev.prescription-quotidien.com
-      LETSENCRYPT_HOST: adminer.dev.prescription-quotidien.com
+      VIRTUAL_HOST: adminer.prescription-quotidien.com
+      LETSENCRYPT_HOST: adminer.prescription-quotidien.com
     networks:
       - presquot
       - nginxproxy
@@ -169,8 +168,8 @@ services:
     command: '--data-dir /data --api-key=K4fae5KYZTVj6Wucp5q9 --enable-cors'
     environment:
       VIRTUAL_PORT: 8108
-      VIRTUAL_HOST: typesense.dev.prescription-quotidien.com
-      LETSENCRYPT_HOST: typesense.dev.prescription-quotidien.com
+      VIRTUAL_HOST: typesense.prescription-quotidien.com
+      LETSENCRYPT_HOST: typesense.prescription-quotidien.com
     networks:
       - presquot
       - nginxproxy
@@ -180,8 +179,8 @@ services:
     image: ghcr.io/bfritscher/typesense-dashboard:latest
     restart: unless-stopped
     environment:
-      VIRTUAL_HOST: admin.typesense.dev.prescription-quotidien.com
-      LETSENCRYPT_HOST: admin.typesense.dev.prescription-quotidien.com
+      VIRTUAL_HOST: admin.typesense.prescription-quotidien.com
+      LETSENCRYPT_HOST: admin.typesense.prescription-quotidien.com
     networks:
       - presquot
       - nginxproxy

diff --git a/.env.production b/.env.production
index 1f00d988b69bafb464886fb647ec67df068718b2..f5199e55d88304abf8cd53cff303dae8b1841f34 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -1,11 +1,11 @@
 APP_NAME="Prescription Santé"
-APP_ENV=staging
+APP_ENV=production
 APP_KEY=base64:dMbgj8cikMFxS0zTvh+lLV5k+zlKRKp0iCaMgdV+HnM=
-APP_DEBUG=true
-APP_URL=https://dev.prescription-quotidien.com
-NOVA_DOMAIN_NAME=admin.dev.prescription-quotidien.com
-ADMIN_DOMAIN_NAME=admin.dev.prescription-quotidien.com
-CLIENT_DOMAIN_NAME=dev.prescription-quotidien.com
+APP_DEBUG=false
+APP_URL=https://prescription-quotidien.com
+NOVA_DOMAIN_NAME=admin.prescription-quotidien.com
+ADMIN_DOMAIN_NAME=admin.prescription-quotidien.com
+CLIENT_DOMAIN_NAME=prescription-quotidien.com
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
@@ -47,7 +47,7 @@ MAIL_FROM_ADDRESS=noreply@prescription-quotidien.com
 MAIL_FROM_NAME="Prescription Santé - Le Quotidien"
 MAIL_REPLYTO=olivier.robichon@prescription-quotidien.com
 
-AWS_URL=https://s3.dev.prescription-quotidien.com/
+AWS_URL=https://s3.prescription-quotidien.com/
 AWS_ACCESS_KEY_ID=gKlQWBg3amQ71lJMM6MF
 AWS_SECRET_ACCESS_KEY=cRhF1qIUTkz5ZedVcwzJXNyXKRQTleBXltVDazNp
 AWS_DEFAULT_REGION=eu-west-3
@@ -68,7 +68,7 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 
 PDF_TO_TEXT_BIN=/usr/bin/pdftotext
 
-TYPESENSE_HOST=typesense.dev.prescription-quotidien.com
+TYPESENSE_HOST=typesense.prescription-quotidien.com
 TYPESENSE_API_KEY=K4fae5KYZTVj6Wucp5q9
 TYPESENSE_PORT=443
 TYPESENSE_PATH=
@@ -77,27 +77,27 @@ TYPESENSE_PROTOCOL=https
 SCOUT_DRIVER=null
 SCOUT_QUEUE=true
 
-GLIDE_BASE_URL=https://dev.prescription-quotidien.com
+GLIDE_BASE_URL=https://prescription-quotidien.com
 GLIDE_BASE_PATH=images
 
 SENTRY_LARAVEL_DSN=https://4ae46b80abfe31d553eb6ad97b159c8f@o4507941042585600.ingest.de.sentry.io/4507941044551760
 
-RECAPTCHA_SITE_KEY=6Leib1srAAAAAFUWuNV863ZT1N9AJ7azUZ55Nrtr
-RECAPTCHA_SECRET_KEY=6Leib1srAAAAAMFQ5qIyUPhUVg9HgTd3cZdGbIFm
+RECAPTCHA_SITE_KEY=6LdEZ_IqAAAAAB2g9rTxfAnw0fdAotCIcwCWb6Xc
+RECAPTCHA_SECRET_KEY=6LdEZ_IqAAAAAPXOqsjkOMRmV0jEbJtXUP1jCbsC
 
 SEARCHABLE_TEXT_MAX_LENGTH=6500
 
 CASHIER_CURRENCY=eur
 CASHIER_CURRENCY_LOCALE=fr
 
-STRIPE_KEY=pk_test_51HcBp3KZBXuYePomhVUc9RxbsZbSfuoiu0NKiotBW4ZKwCbM6sLlPMLSyPDQeB0MUXoQD3qbk23eJ41NVpM1z1oT00lg84Ywcq
-#STRIPE_KEY=pk_live_51HcBp3KZBXuYePomUas8grrrQF6tHdMnycXZGMspMz8BR1ql81JBpwfZUiCkU5xlbxXp4o9RSycfoop1om9TKFuY00LBd38d7X
+#STRIPE_KEY=pk_test_51HcBp3KZBXuYePomhVUc9RxbsZbSfuoiu0NKiotBW4ZKwCbM6sLlPMLSyPDQeB0MUXoQD3qbk23eJ41NVpM1z1oT00lg84Ywcq
+STRIPE_KEY=pk_live_51HcBp3KZBXuYePomUas8grrrQF6tHdMnycXZGMspMz8BR1ql81JBpwfZUiCkU5xlbxXp4o9RSycfoop1om9TKFuY00LBd38d7X
 
-STRIPE_SECRET=sk_test_51HcBp3KZBXuYePomWOeN9osNwPbT7t27L0cltLPox5ybJsIXQj1zgw56fgF5OJ7WcTyx7BlGvd2BF0TLeoxIjqi900Lk2BLaNk
-#STRIPE_SECRET=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
+#STRIPE_SECRET=sk_test_51HcBp3KZBXuYePomWOeN9osNwPbT7t27L0cltLPox5ybJsIXQj1zgw56fgF5OJ7WcTyx7BlGvd2BF0TLeoxIjqi900Lk2BLaNk
+STRIPE_SECRET=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
 
-STRIPE_WEBHOOK_SECRET=whsec_ZpPYRV5SOiegHxKDCVc2Wj256S3zf5o8
-#STRIPE_WEBHOOK_SECRET=whsec_cd9kWW3nXgUVoY7cOtkx47K8tgMTFvlA
+#STRIPE_WEBHOOK_SECRET=whsec_ZpPYRV5SOiegHxKDCVc2Wj256S3zf5o8
+STRIPE_WEBHOOK_SECRET=whsec_cd9kWW3nXgUVoY7cOtkx47K8tgMTFvlA
 
 STRIPE_ENABLE=true
 STRIPE_TEST_SOCIAL_ID=14

diff --git a/public/.htaccess b/public/.htaccess
index 63a486931a849aa22b32bbe2c5387996e55515b6..a4bcdcc3161470615a24a8b5754164168179e287 100644 (file)
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -5,6 +5,10 @@
 
     RewriteEngine On
 
+    # Redirection to www. subdomain
+    RewriteCond %{HTTP_HOST} ^www.prescription-quotidien.com$
+    RewriteRule ^(.*)$ https://prescription-quotidien.com/$1 [R=308,L]
+
     # Handle Authorization Header
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]