wip #7378 @1.5

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 5495b3393cb3b2ca6f156c5b4f1376eae773d3aa..9055183880306a942f5bef1d7beeab015fed9e21 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -67,8 +67,8 @@ services:
     image: 'mariadb:latest'
     restart: unless-stopped
     environment:
-      MARIADB_ROOT_PASSWORD: DrNmo8VaNLTEWaX3
-      MARIADB_DATABASE: dtlc-dev
+      MARIADB_ROOT_PASSWORD: PgjM7RGykgh3P7Cw
+      MARIADB_DATABASE: dtlc
       MARIADB_AUTO_UPGRADE: 1
     volumes:
       - "./database/dump.sql:/docker-entrypoint-initdb.d/dump.sql"
@@ -90,7 +90,7 @@ services:
       - "./database/backup:/backup"
     environment:
       USERNAME: root
-      PASSWORD: DrNmo8VaNLTEWaX3
+      PASSWORD: PgjM7RGykgh3P7Cw
       DBHOST: dtlc-dev-mariadb
       DBEXCLUDE: "performance_schema information_schema"
       CRON_SCHEDULE: "0 0 * * *"

diff --git a/.docker/syncprodtodev b/.docker/syncprodtodev
new file mode 100644 (file)
index 0000000..0bdc9aa
--- /dev/null
+++ b/.docker/syncprodtodev
@@ -0,0 +1,13 @@
+#!/bin/sh
+rsync -avz --delete --exclude-from /home/dtlc/dev/.docker/syncprodtodev.exclude --delete-excluded /home/dtlc/www/files/ /home/dtlc/dev/files/
+# Sync database
+docker stop dtlc-dev-mariadb
+rm -rf /docker/dtlc-dev/database/data/*
+rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/
+docker stop dtlc-mariadb
+rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/
+sleep 1
+rsync -avz /docker/dtlc/database/data/ /docker/dtlc-dev/database/data/
+docker start dtlc-mariadb
+# Update and restart dev containers
+/docker/dtlc-dev/update

diff --git a/.docker/syncprodtodev.exclude b/.docker/syncprodtodev.exclude
new file mode 100644 (file)
index 0000000..f81cdd7
--- /dev/null
+++ b/.docker/syncprodtodev.exclude
@@ -0,0 +1,2 @@
+processed
+rasterized
\ No newline at end of file

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index aa557347e63feaf9f2e40cd35d9e3f178d727c42..2e3e6267ccfdb8cc9ece15ad4470bc4e1d066e1c 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -74,15 +74,11 @@ firephp = false
 
 httpauth.username = dtlc
 httpauth.password = dtlc17
-httpauth.ip_whitelist[] = 88.190.245.49
-httpauth.ip_whitelist[] = 91.121.74.76
+httpauth.ip_whitelist[] = 176.134.43.17
 httpauth.excludepath = /payment/auto
 httpauth.excludepath = /sogecommerce/auto
 
 database.params.host = dtlc-dev-mariadb
-database.params.password = DrNmo8VaNLTEWaX3
-database.params.dbname = dtlc-dev
-
 sogenactif.url = https://payment-webinit.simu.sips-atos.com/paymentInit
 sogenactif.key = 002001000000001_KEY1
 sogenactif.key_version = 1