#7781

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index cf94ebf6b3436a94c8e5fe8c3c8b6cc819b288ab..8cf07dd8d93912c41f0de53ff6764daedfd35c05 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: pmi-httpd
@@ -121,5 +120,5 @@ services:
 
 networks:
   pmi:
-    external:
-      name: pmi
+    name: pmi
+    external: true

diff --git a/.docker/production/terminal.bat b/.docker/production/terminal.bat
index 8dfab015de7968ed70f84c9c1317ed591fe66b09..cf8db3dd0ad225eb54b70c97ce6abec2184603e1 100644 (file)
--- a/.docker/production/terminal.bat
+++ b/.docker/production/terminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-ssh -t root@godzilla.cubedesigners.com 'docker exec -it -u pmi pmi /bin/bash'
+ssh -t root@cloudatlas.cubedesigners.com 'docker exec -it -u pmi pmi /bin/bash'

diff --git a/.docker/production/update b/.docker/production/update
index 03b365f5042b09572eee64829edc09ad2c7fccdd..6b847323204d79fbd1d15eec77420646cf220e29 100644 (file)
--- a/.docker/production/update
+++ b/.docker/production/update
@@ -14,3 +14,4 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 docker compose down
 docker compose up -d
+docker stop pmi-mariadb;rm database/data/tc.log;docker start pmi-mariadb

diff --git a/.env.production b/.env.production
index 15d522ff5a0aa298c72eec50f1712f8ba5cef2cf..28f8b8736e201286b9fd8f42ffb337f6e4d19585 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ APP_VARIANTS=PMI,MICHSCI
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=pmi-mariadb
+DB_HOST=mariadb
 DB_PORT=3306
 DB_DATABASE=pmi
 DB_USERNAME=root
@@ -27,14 +27,15 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com
-MAIL_PORT=587
-MAIL_USERNAME=ca110b35f8735c223d69c9987c2ac47d
-MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
-MAIL_ENCRYPTION=tls
+
+MAIL_ENCRYPTION=false
+MAIL_HOST=postal.cubedesigners.com
+MAIL_PORT=25
+MAIL_USERNAME=pmi/pmi
+MAIL_PASSWORD=S2ET8BISQ6bRBDGx1fYFB4Vs
 MAIL_FROM_ADDRESS=web@pm-instrumentation.com
 MAIL_FROM_NAME="PM-Instrumentation"
-MAIL_TO_ADDRESS=soufiane@cubedesigners.com
+MAIL_TO_ADDRESS=test+pmi@cubedesigners.com
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

diff --git a/.env.staging b/.env.staging
deleted file mode 100644 (file)
index 0c89144..0000000
--- a/.env.staging
+++ /dev/null
@@ -1,64 +0,0 @@
-APP_NAME=PMI
-APP_ENV=production
-APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94=
-APP_DEBUG=true
-APP_URL=https://staging.pm-instrumentation.com
-APP_VARIANTS=PMI,MICHSCI
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=localhost
-DB_PORT=3306
-DB_DATABASE=pmi
-DB_USERNAME=pmi
-DB_PASSWORD=ZJMcD6nAc3xnLjLVKZ2iWi69
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=memcached
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-SESSION_DOMAIN=.pm-instrumentation.com,.michsci-europe.com
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=in-v3.mailjet.com
-MAIL_PORT=587
-MAIL_USERNAME=ca110b35f8735c223d69c9987c2ac47d
-MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b
-MAIL_ENCRYPTION=tls
-MAIL_FROM_ADDRESS=web@pm-instrumentation.com
-MAIL_FROM_NAME="PM-Instrumentation"
-MAIL_TO_ADDRESS=contact@pm-instrumentation.com
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-SEO_ROBOTS=false
-
-GOOGLE_ANALYTICS_ID=UA-4339912-10
-BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW
-
-CUBIST_INTERNAL_SEARCH=true
-CUBIST_INTERNAL_SEARCH_INDEX=pmi_production
-
-ELASTICSEARCH_HOST=127.0.0.1
-ELASTICSEARCH_PORT=9200
-ELASTICSEARCH_SCHEME=http
-ELASTICSEARCH_USER=
-ELASTICSEARCH_PASS=
-
-FEATURE_QUOTE=true
-FEATURE_NEWS=true
-FEATURE_SEARCH=true
-FEATURE_I18N=true
-FEATURE_TEAM=true
-FEATURE_CLIENTS=true

diff --git a/composer.json b/composer.json
index 62a00f2a8c30600941c1c82f0df3376846621fe3..7670a24817d3d79d30f9823ceed658c03b2a1192 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
             "composer/installers": true
         },
         "platform": {
-            "php": "8.0"
+            "php": "7.4"
         }
     },
     "extra": {

diff --git a/config/app.php b/config/app.php
index fd654df3ee804bf2903e19d1880f0a36440c4fd0..fbf50589256e0cbdce7495b577570c51e82d075e 100644 (file)
--- a/config/app.php
+++ b/config/app.php
@@ -46,7 +46,7 @@ return [
     |
     */
 
-    'debug' => (isset($_SERVER['HTTP_X_REAL_IP']) && $_SERVER['HTTP_X_REAL_IP'] === '130.180.213.67') || env('APP_DEBUG', false),
+    'debug' => !isset($_SERVER['HTTP_X_REAL_IP']) || in_array($_SERVER['HTTP_X_REAL_IP'], ['176.134.43.17', '82.64.156.165']) ? env('APP_DEBUG') : false,
 
     'debug_blacklist' => [
         '_ENV' => [

diff --git a/public/index.php b/public/index.php
index 4584cbcd6ad53d355c4448fc0823febd90fb5340..787d959cd45605c3656300749b3dde571842f4c1 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Laravel - A PHP Framework For Web Artisans
  *