wip #6278 @0.5

diff --git a/.docker/dev/images/php-fpm/Dockerfile b/.docker/dev/images/php-fpm/Dockerfile
index 8a2be84584c71f12344c5707c52a18cf7bb8edee..2e5bd84c0281664d2347703ac05dccd9e2b03848 100644 (file)
--- a/.docker/dev/images/php-fpm/Dockerfile
+++ b/.docker/dev/images/php-fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN apt update \
 
 # Add Nodejs Repository
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_12.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt update
 

diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml
index 2a983defefbe52c4c0be5f8ce5e52b7b947dd9a0..43a135ddeaeeffc870b65eab974ac7d11025aaae 100644 (file)
--- a/.docker/production/docker-compose.yml
+++ b/.docker/production/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       - './config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini'
       # Web path
       - '/home/pmi/www:/application'
-      - '/home/pmi/dev/.env.production:/application/.env'
+      - '/home/pmi/www/.env.production:/application/.env'
     ports:
       - '49389:22'
     networks:
@@ -96,12 +96,12 @@ services:
       - pmi
 
   redis:
-    container_name: pmi-dev-redis
+    container_name: pmi-redis
     image: redis
     volumes:
       - './redis/data:/data'
     networks:
-      - pmi-dev
+      - pmi
     restart: unless-stopped
 
   elasticsearch:

diff --git a/.docker/production/images/php-fpm/Dockerfile b/.docker/production/images/php-fpm/Dockerfile
index 8a2be84584c71f12344c5707c52a18cf7bb8edee..ba2ec6905d3cebfe6c7c6a22d902ae464891efdd 100644 (file)
--- a/.docker/production/images/php-fpm/Dockerfile
+++ b/.docker/production/images/php-fpm/Dockerfile
@@ -20,7 +20,7 @@ RUN apt update \
 
 # Add Nodejs Repository
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x focal main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt update
 
@@ -71,7 +71,7 @@ CMD ["php", "-a"]
 
 STOPSIGNAL SIGQUIT
 
-RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 pmi-dev
+RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 pmi
 
 # PHP-FPM packages need a nudge to make them docker-friendly
 COPY overrides.conf /etc/php/7.4/fpm/pool.d/z-overrides.conf

diff --git a/.docker/production/images/php-fpm/startup b/.docker/production/images/php-fpm/startup
index 5f2fd39a67fd8dd4db6a407406843f302f00d3e9..382aa9bf0b1f5b66777f165ec8690813aa5bcbae 100644 (file)
--- a/.docker/production/images/php-fpm/startup
+++ b/.docker/production/images/php-fpm/startup
@@ -5,7 +5,7 @@ umask 0000
 chmod -R 777 /tmp
 
 chown -R root:root /etc/sudoers.d
-chown -R pmi-dev:www-data /application
+chown -R pmi:www-data /application
 
 # Rsyslog
 start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n

diff --git a/.env.production b/.env.production
index 1bbecaa368a2d6c4a6eeb797a0916606179de433..4d59957bc6e1c07a1b935e4f81a70d2e2bbfdd45 100644 (file)
--- a/.env.production
+++ b/.env.production
@@ -1,26 +1,28 @@
 APP_NAME=PMI
 APP_ENV=production
 APP_KEY=base64:/Jmlg7TepI/inQ4KJ3VF0YVTqghRGvvBrnDI7NkUk94=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=https://www.pm-instrumentation.com
 APP_VARIANTS=PMI,MICHSCI
+
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=localhost
+DB_HOST=pmi-mariadb
 DB_PORT=3306
 DB_DATABASE=pmi
-DB_USERNAME=pmi
-DB_PASSWORD=ZJMcD6nAc3xnLjLVKZ2iWi69
+DB_USERNAME=root
+DB_PASSWORD=uOvpiRwybTsT1Gyc
 
 BROADCAST_DRIVER=log
-CACHE_DRIVER=memcached
+
+CACHE_DRIVER=redis
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 SESSION_DOMAIN=.pm-instrumentation.com,.michsci-europe.com
 
-REDIS_HOST=127.0.0.1
+REDIS_HOST=pmi-redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
@@ -32,7 +34,6 @@ 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=
@@ -50,11 +51,12 @@ BACKPACK_LICENSE=YwdOWjeEczPAwy06GzkBJggW
 CUBIST_INTERNAL_SEARCH=true
 CUBIST_INTERNAL_SEARCH_INDEX=pmi_production
 
-ELASTICSEARCH_HOST=127.0.0.1
+ELASTICSEARCH_HOST=pmi-elasticsearch
 ELASTICSEARCH_PORT=9200
 ELASTICSEARCH_SCHEME=http
 ELASTICSEARCH_USER=
 ELASTICSEARCH_PASS=
+ELASTICSEARCH_INDEX_NAME=index
 
 FEATURE_QUOTE=true
 FEATURE_NEWS=true

diff --git a/routes/web.php b/routes/web.php
index 532001b771179605e5aa35fb6d6d665157290987..cdb8aea2e7b712f69301e60ad8af77838d92ea96 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,4 +1,5 @@
 <?php
+URL::forceScheme('https');
 
 Route::get('/deconnexion', 'Client\ClientController@logout');