diff --git a/docker/.env.example b/docker/.env.example index 602fcf7..033d7d2 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -20,14 +20,14 @@ DB_PAYMENT_USER=root DB_PAYMENT_PASS=3w71Qacjl3kh1pOgJUeD5jRBnG3jRVpf DB_PRIMARY_HOST_V2=mysql -DB_PRIMARY_NAME_V2=jorSiroDB +DB_PRIMARY_NAME_V2=mainDB DB_PRIMARY_USER_V2=intaleqapp-jordan-siro DB_PRIMARY_PASS_V2=7B7skfibrexQrGCUG1Y8 DB_PRIMARY_HOST=mysql -DB_PRIMARY_NAME=intaleqDB1 -DB_PRIMARY_USER=intaleqUserDB1 -DB_PRIMARY_PASS=NANatr7j4d8HzZjAcp00bbsjkdhfjsn +DB_PRIMARY_NAME=mainDB +DB_PRIMARY_USER=intaleqapp-jordan-siro +DB_PRIMARY_PASS=7B7skfibrexQrGCUG1Y8 DB_TRACKING_HOST=mysql DB_TRACKING_NAME=locationDB @@ -35,13 +35,13 @@ DB_TRACKING_USER=intaleqLocation DB_TRACKING_PASS=9otdMyiExMTXwnoA32sP DB_RIDE_HOST=mysql -DB_RIDE_NAME=intaleq-ridesDB +DB_RIDE_NAME=rideDB DB_RIDE_USER=intaleq-rides DB_RIDE_PASS=0bHHMALEj4sqSmdT0avT DB_TRANSIT_HOST=mysql DB_TRANSIT_PORT=3306 -DB_TRANSIT_NAME=siroTransitDb +DB_TRANSIT_NAME=transitDB DB_TRANSIT_USER=siroTransitUser DB_TRANSIT_PASS=eZiDYxCJ2yyGfC32zG0Z diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 46e1fc1..cbb9dd7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -8,7 +8,7 @@ # التشغيل: docker compose up -d --build (انظر README.md) # ============================================================ -name: siro +name: intaleq services: nginx: @@ -139,6 +139,9 @@ services: - noeviction - --appendonly - "yes" + - --requirepass + - "${REDIS_MAIN_PASSWORD:-}" + env_file: .env volumes: - redis-data:/data mem_limit: 512m diff --git a/docker/mysql/init/00-databases.sql b/docker/mysql/init/00-databases.sql index b26a808..34ce03f 100644 --- a/docker/mysql/init/00-databases.sql +++ b/docker/mysql/init/00-databases.sql @@ -1,25 +1,20 @@ -- تُنشأ القواعد فارغة عند أول إقلاع فقط (volume جديد). --- ⚠️ الأسماء مطابقة لبيئة اللايف الخاصة بك. -CREATE DATABASE IF NOT EXISTS `jorSiroDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE DATABASE IF NOT EXISTS `intaleqDB1` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE IF NOT EXISTS `mainDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE IF NOT EXISTS `rideDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; CREATE DATABASE IF NOT EXISTS `locationDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE DATABASE IF NOT EXISTS `intaleq-ridesDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE DATABASE IF NOT EXISTS `siroTransitDb` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE IF NOT EXISTS `transitDB` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; --- إنشاء المستخدمين وإعطائهم الصلاحيات لكي تتطابق البيئة مع اللايف 100% +-- إنشاء المستخدمين وإعطائهم الصلاحيات CREATE USER IF NOT EXISTS 'intaleqapp-jordan-siro'@'%' IDENTIFIED BY '7B7skfibrexQrGCUG1Y8'; -GRANT ALL PRIVILEGES ON `jorSiroDB`.* TO 'intaleqapp-jordan-siro'@'%'; - -CREATE USER IF NOT EXISTS 'intaleqUserDB1'@'%' IDENTIFIED BY 'NANatr7j4d8HzZjAcp00bbsjkdhfjsn'; -GRANT ALL PRIVILEGES ON `intaleqDB1`.* TO 'intaleqUserDB1'@'%'; +GRANT ALL PRIVILEGES ON `mainDB`.* TO 'intaleqapp-jordan-siro'@'%'; CREATE USER IF NOT EXISTS 'intaleqLocation'@'%' IDENTIFIED BY '9otdMyiExMTXwnoA32sP'; GRANT ALL PRIVILEGES ON `locationDB`.* TO 'intaleqLocation'@'%'; CREATE USER IF NOT EXISTS 'intaleq-rides'@'%' IDENTIFIED BY '0bHHMALEj4sqSmdT0avT'; -GRANT ALL PRIVILEGES ON `intaleq-ridesDB`.* TO 'intaleq-rides'@'%'; +GRANT ALL PRIVILEGES ON `rideDB`.* TO 'intaleq-rides'@'%'; CREATE USER IF NOT EXISTS 'siroTransitUser'@'%' IDENTIFIED BY 'eZiDYxCJ2yyGfC32zG0Z'; -GRANT ALL PRIVILEGES ON `siroTransitDb`.* TO 'siroTransitUser'@'%'; +GRANT ALL PRIVILEGES ON `transitDB`.* TO 'siroTransitUser'@'%'; FLUSH PRIVILEGES;