sync configs

This commit is contained in:
Sergey Paramoshkin 2025-02-02 18:52:09 +03:00
parent 531b923eb7
commit 160541e45e
4 changed files with 77 additions and 4 deletions

5
.my.cnf Normal file
View File

@ -0,0 +1,5 @@
[client]
user = root
password = root
host = db
port = 3306

24
configs/admin/default Normal file
View File

@ -0,0 +1,24 @@
server {
server_name stagingadmin.dot-dot.ru;
listen 443 ssl;
ssl_certificate /etc/nginx/ssl/dot2024.crt;
ssl_certificate_key /etc/nginx/ssl/dot2024.key;
index index.php index.html index.htm;
root /application/public;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
fastcgi_pass localhost:9000;
try_files $uri =404;
fastcgi_index index.php;
}
}

View File

@ -0,0 +1,13 @@
{
"type": "service_account",
"project_id": "t-t-logistics",
"private_key_id": "d43ca447a200d75f02886d06689212e27f0fd823",
"private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCeqg8yH6kQp+eL\nJqjrwkgDHyw6xnKUqjidAV7C259tZD6BXzxcqzaqKc3DdCWyB8Eu0EpTfBsp6M+6\n3KACXXZ++Pd3bgzp3KOFRV16eDLr/xkvGUlMIKwb3saDjnPSdvrU0TqwCURQ+PEi\nPm6s4UTZ/bPp/h62q/oTxB3bQVwoOUcCljPynjAYUG49OXVbUW1yCMbgo1QUIXbU\n/b7mcNwjNyUnUX3mTjarjEVislqkO0j5XB06Hdnnb0z7OED0nJSV6ZRA0933Y4hL\nS+JFer1IuQGP3B8NpMdmOdCDpZPb4odcgt2Zw4gwqEV3iCE7OmXJtAQq/Nmd3luh\n6Sls4FVPAgMBAAECggEAPimZl4VA+0YVWPbWErxE83gon4R1itpgIN9TDZv3S+gM\n9ynlX9cyrRuAwtWEGUqhfOJdZHUIvXQ5wtfClvqgPOH1LqT+yTdJF6NUGvHx3XVO\nHB5XkcxxMeAnvY43wZsc7flleWfADMtjygtU2EXP8GpOLVyDEwWxDkJ1ghwK67Ta\ndpQWWbSnqo1alEWdELJ8y39xJrB/JSnFGc2sstfD5tx4fJ+1jI0ZvnCz3G1d42Rr\nnLaHfRoGSt5TddyvqejAXOhtL/Rhnki1XKhrl9/v1d25kUFPc+dK8z4yUXpWAHWs\nQfhPkRCaEYdTy9wbQ3T2tRATamuxYdGRGPVh47BSHQKBgQDeVHtk1MZVW0mohTCm\n+dto4QPGe0CVomQ1M6DGLv8fLpCTCpb2vdeftVjWXghZrWWaYBK3nZcyTP5+ii/g\nDW94TFWzB3a0M+tE1BGwc8Y9fifGqgcTeIxDbZzrDjmhOlebSvygX4uclmplPznl\ncaRpva3W6XJYGnCqMJf/XSaRTQKBgQC2sVHSA9X58Wy3ZTrbtTC1xGDx/2yGvoAw\n8w5pSj2w8f6wXvBV32uGWdf74s7XLS3g4I/y9nUGAJRJfzbBMwaAzjGHGX5UC6kp\nNJ5ZCfyRFOJ2hllIcsksj96RyDATry4fTc210XwXHHauz4tsqSfP6JomWggh6fj6\nTf4oq3zzCwKBgD1doiVlmUysArux74jXBBmBqhIZqOzkQrZwhprNE/veVWdQj/SQ\n17gsTNX2ZGWkN5wRknj91WK73667o5U7AB57K1hb4gbBIdoAktVaT0hfzsjF22gj\naMufsKUsavm2acHiQ7JcTOOunLVPa0KKSHArO5VLIBVzTs+a1AlXA7MtAoGAGRaw\nzc6JDBIDhAv60UFIty2IwrL5DGgM4qv+RqdTYYFaII5pIuHTuleMOaMkFJi3vDIa\nkpsV5wUdWBqIQm/nbLjkRFFT7+bKDEaVmFSuwp3Dm9NHX5Oj3OLFBfAf6hQcmV/t\n6BIkoGfgRJFr7Dgup3ah9LJYe4/OCVG8nYkvV5ECgYBFfQlhYv24M4RHQ/EbOIJY\nmZgZzcGz7nA0AWS8zeSoTizAtPwnoPElOs/+drJ+CKaAnfr8+BZ1spP2I8Sj6l9g\nXeDBlZvX7Q1baz6vdQr1KscjmWnHUbaDCrGWK+95umAVpyrabopynQt7T0GrBWKz\n+nixrt/C57fjiE2OHM8big==\n-----END PRIVATE KEY-----\n",
"client_email": "firebase-push-auth-dd@t-t-logistics.iam.gserviceaccount.com",
"client_id": "117030561604837789287",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-push-auth-dd%40t-t-logistics.iam.gserviceaccount.com",
"universe_domain": "googleapis.com"
}

View File

@ -12,7 +12,6 @@ volumes:
x-defaults-php: &defaults-php
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
restart: unless-stopped
user: www-data
volumes:
- ./configs/php/.env:/application/.env
- ./configs/php/.env.local:/application/.env.local
@ -55,6 +54,17 @@ services:
networks:
- dd
mysqld-exporter:
image: prom/mysqld-exporter:v0.15.1
restart: unless-stopped
command: --config.my-cnf=/.my.cnf
volumes:
- ./.my.cnf:/.my.cnf
depends_on:
- db
networks:
- dd
backend:
<<: *defaults-php
@ -113,12 +123,12 @@ services:
admin:
image: registry.dot-dot.ru/admin:${ADMIN_TAG}
# user: www-data
# command: frankenphp php-server -r /application/public
command: sh -c 'php-fpm -D; nginx'
restart: unless-stopped
command: sh -c 'php-fpm -D; nginx'
volumes:
- ./configs/admin/default:/etc/nginx/sites-enabled/default
- ./configs/admin/.env:/application/.env
- ./configs/nginx/ssl:/etc/nginx/ssl
depends_on:
- db
networks:
@ -178,6 +188,27 @@ services:
networks:
dd: {}
signer:
image: registry.dot-dot.ru/signer:${SIGNER_TAG}
command: "frankenphp php-server -l 0.0.0.0:8000 -r ./public"
restart: unless-stopped
privileged: true
volumes:
- ./signeddocs:/documents
- ./configs/signer/.env:/usr/src/signer/backend/.env
- ./configs/signer/.env.local:/usr/src/signer/backend/.env.local
# - ./configs/signer/license.key:/usr/src/signer/license.key
- /dev/bus/usb:/dev/bus/usb
env_file:
- ./configs/signer/.env.local
- ./configs/signer/.env
extra_hosts:
- "staging.dot-dot.ru:192.168.100.110"
- "staginglms.dot-dot.ru:192.168.100.110"
- "stagingsigner.dot-dot.ru:192.168.100.110"
networks:
- dd
cabinet:
image: registry.dot-dot.ru/dot_dot_cargo_carrier:${CABINET_TAG}
restart: unless-stopped