diff --git a/.env b/.env index b3385f7..ba3a846 100755 --- a/.env +++ b/.env @@ -1,13 +1,11 @@ COMPOSE_PROJECT_NAME=teste NETWORK=teste -FRONT_TAG=master -DOTDOT_TAG=DD-3865 -LMS_TAG=DD-3865 -DASHBORD_TAG=master -MLTORGTRANS_TAG=master -MLATRUCKS_TAG=master -ADMIN_TAG=master +FRONT_TAG=DD-3615-STORY +DOTDOT_TAG=DD-3615-STORY +LMS_TAG=DD-3615-STORY +ADMIN_TAG=dashboard +CABINET_TAG=master MYSQL_PORT=0.0.0.0:33065 MYSQL_ROOT_PASSWORD=root diff --git a/configs/admin/.env b/configs/admin/.env index 97ac4e9..034d40c 100644 --- a/configs/admin/.env +++ b/configs/admin/.env @@ -1,3 +1,80 @@ -NUXT_HOST=0.0.0.0 -NUXT_PORT=3000 -DOMAIN=testeadmin.dot-dot.ru \ No newline at end of file +APP_NAME="DOT-DOT admin" +APP_ENV=production +APP_KEY=base64:54d0glUSEueuhTWS0B45/WMCLlnbgFKpUP2hfgE7Xs4= +APP_DEBUG=true +APP_TIMEZONE=UTC +APP_URL=https://testaadmin.dot-dot.ru +FRONTEND_URL=https://testaadmin.dot-dot.ru +ASSET_URL=https://testaadmin.dot-dot.ru +APP_EMAIL_DOMAIN="dot-dot.ru" + +APP_LOCALE=ru +APP_FALLBACK_LOCALE=ru +APP_FAKER_LOCALE=ru_RU + +APP_MAINTENANCE_DRIVER=file +# APP_MAINTENANCE_STORE=database + +BCRYPT_ROUNDS=12 + +LOG_CHANNEL=stack +LOG_STACK=single +LOG_DEPRECATIONS_CHANNEL=null +LOG_LEVEL=debug + +DEFAULT_DB_CONNECTION=dashboard + +#Параметры подключения к базе панели управления + +DASHBOARD_DB_HOST=db +DASHBOARD_DB_PORT=3306 +DASHBOARD_DB_DATABASE=dashboard +DASHBOARD_DB_USERNAME=root +DASHBOARD_DB_PASSWORD=root + +#Параметры подключения к базе dot-dot + +DOT_DOT_DB_HOST=db +DOT_DOT_DB_PORT=3306 +DOT_DOT_DB_DATABASE=dot +DOT_DOT_DB_USERNAME=dot +DOT_DOT_DB_PASSWORD=dot + +SESSION_DRIVER=database +SESSION_LIFETIME=120 +SESSION_ENCRYPT=false +SESSION_PATH=/ +SESSION_DOMAIN=null + +BROADCAST_CONNECTION=log +FILESYSTEM_DISK=local +QUEUE_CONNECTION=database + +CACHE_STORE=database +CACHE_PREFIX= + +MEMCACHED_HOST=127.0.0.1 + +REDIS_CLIENT=phpredis +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=log +MAIL_HOST=127.0.0.1 +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="hello@example.com" +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= +AWS_USE_PATH_STYLE_ENDPOINT=false + +VITE_APP_NAME="${APP_NAME}" + +DOT_DOT_HOST=https://testa.dot-dot.ru diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh index bc2988a..0577be5 100755 --- a/configs/cabinet/entrypoint.sh +++ b/configs/cabinet/entrypoint.sh @@ -1,10 +1,19 @@ #!/bin/sh DOMAIN="${DOMAIN:-lmscabinet.dot-dot.ru}" +# API_URL='"API_URL": "https://dot-dot.ru/"' +# d='https://dot-dot.ru/' for x in $(grep -lrw "lmscabinet.dot-dot.ru" .nuxt/);do echo "replace lmscabinet.dot-dot.ru to https://${DOMAIN} in $x" - sed -i -e "s/lmscabinet.dot-dot.ru/${DOMAIN}/g" $x; + sed -i -e "s|lmscabinet.dot-dot.ru|${DOMAIN}|g" $x; +done + +for x in $(grep -lrw "https://dot-dot.ru" .nuxt/);do + echo "replace https://dot-dot.ru to ${API_URL} in $x" + sed -i -e "s|https://dot-dot.ru|${API_URL}|g" $x; + echo "fix double //" + sed -i -e "s|\/\/\"|/|g" $x; done "$@" diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index 3ab1023..063e14f 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -1,9 +1,23 @@ server { - server_name testeadmin.dot-dot.ru; + listen 80; + server_name testaadmin.dot-dot.ru; + return 301 https://$server_name$request_uri; +} + +server { + listen 443 ssl ; + server_name testaadmin.dot-dot.ru; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + client_max_body_size 10m; + access_log /var/log/nginx/testaadmin.dot-dot.ru_access.log json; + error_log /var/log/nginx/testaadmin.dot-dot.ru_error.log; + location / { - proxy_pass http://dashboard:80; + proxy_pass https://testa-admin-1:443; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index 31fc78f..866773d 100644 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -115,4 +115,36 @@ server { include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } + + location /mysql_exporter { + access_log /var/log/nginx/mysql_exporter_access.log json; + error_log /var/log/nginx/mysql_exporter_error.log; + + #if ($allow = 0) { + # return 403; + #} + + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_http_version 1.1; + proxy_pass http://mysqld-exporter:9104/metrics; + } + + location /redis_exporter { + access_log /var/log/nginx/mysql_exporter_access.log json; + error_log /var/log/nginx/mysql_exporter_error.log; + + #if ($allow = 0) { + # return 403; + #} + + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_http_version 1.1; + proxy_pass http://redis-exporter:9121/metrics; + } } diff --git a/docker-compose.yml b/docker-compose.yml index ccad4d9..feb4d0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -179,3 +179,16 @@ services: - "--redis.addr=redis://redis:6379" networks: dd: {} + + cabinet: + image: registry.dot-dot.ru/dot_dot_cargo_carrier:${CABINET_TAG} + restart: unless-stopped + command: npm run start + volumes: + - ./configs/cabinet/.env:/app/.env + - ./configs/cabinet/entrypoint.sh:/entrypoint.sh + env_file: + - ./configs/cabinet/.env + entrypoint: /entrypoint.sh + networks: + - dd