From 5f2455c4731903db6964b9ae3c32e6e8ca6134ee Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 8 Oct 2025 14:36:38 +0200 Subject: [PATCH] wait #7781 @0.5 --- .docker/production/docker-compose.yml | 5 +-- .docker/production/terminal.bat | 2 +- .env.production | 6 +-- .env.staging | 64 --------------------------- composer.json | 2 +- config/app.php | 2 +- public/index.php | 1 - 7 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 .env.staging diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml index cf94ebf..8cf07dd 100644 --- 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 8dfab01..cf8db3d 100644 --- 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/.env.production b/.env.production index 86c0621..28f8b87 100644 --- 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 @@ -28,10 +28,6 @@ REDIS_PORT=6379 MAIL_DRIVER=smtp -#MAIL_HOST=in-v3.mailjet.com -#MAIL_PORT=587 -#MAIL_USERNAME=ca110b35f8735c223d69c9987c2ac47d -#MAIL_PASSWORD=b289d0acb08e0fe56ce98ccf0dd1ed8b MAIL_ENCRYPTION=false MAIL_HOST=postal.cubedesigners.com MAIL_PORT=25 diff --git a/.env.staging b/.env.staging deleted file mode 100644 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 62a00f2..7670a24 100644 --- 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 fd654df..fbf5058 100644 --- 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 4584cbc..787d959 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,4 @@