From b582ec40edf4f56d35fd02d87e90e0c95e24d0a2 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Tue, 3 Feb 2026 20:37:01 +0300 Subject: [PATCH] auto update repo --- .env | 3 + .../nginx/conf.d/.newlms.dot-dot.ru.conf.swp | Bin 16384 -> 0 bytes configs/nginx/conf.d/newlms.dot-dot.ru.conf | 105 +----------------- 3 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 configs/nginx/conf.d/.newlms.dot-dot.ru.conf.swp diff --git a/.env b/.env index f1b2a27..88673f4 100644 --- a/.env +++ b/.env @@ -11,6 +11,9 @@ LANDINGTTL_TAG=TD-625 CVIEW_TAG=master SINGLEOFFICE_TAG=STORY-DD-4277 SINGLEOFFICEFRONT_TAG=STORY-DD-4277 +DOTDOTLMS_TAG=master +DOTDOTCABINET_TAG=master + MYSQL_PORT=0.0.0.0:33067 MYSQL_ROOT_PASSWORD=root MYSQL_DATABASE=dot diff --git a/configs/nginx/conf.d/.newlms.dot-dot.ru.conf.swp b/configs/nginx/conf.d/.newlms.dot-dot.ru.conf.swp deleted file mode 100644 index e82035f8d90f5f8f1785680eb0e13012af36e084..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI2ON<=F8OJLo5HJ{sE#-hCQLIOrwV9co-L>qsjis#CyRc%{>)>4=itScUcg;+B zd%8PS)t*_rStPh%B)}lcm*l`hio`t^gv2dT;zWW2QY3Oo4vqmIa>yaam>gwo)xgR-;z0p6>YY@SCe8CFbZs{ zK&|`v1R=5%M+o1Goa-1Mh-2fCQ(&Ja`h^e3X!H!C%2&z%}p*xCA&j z0(OGyy9oIdTmfxx4!jIr0?&XSgNMOR@SjHr`5gQi{0aOXTmr9y*FX~-2ZzBS@C5kx z!-RYTz6M`{kHJUaL+}ppz&UUhOoJitQ?M7@5B|B6kiUbk!24hobU+(8;5ax84uK&+ zz~3Gs z;F|{s`3zhHN5J*_2`PY^xGD27SOs-(2K*B21vl%(k)xV659%R3H(Yu8OeJbY`-iQ{f&GPJq(4XGNJ(psyTk(T z=#gr59WPlPRp2c?NvHABH)aTE`OVy}UlR(_5lqo*tX?9@Vuo|-?6 z&-qgeGxH};m*|P9*{Ox8?f9D%%tJ-F<7=Nv#B4jc=LN^hI7ND(*MfbUHldrT&{Qh2 zp#ogw`tR3kJ*hiXFcph{j#dx$iqPltrF6xfWkEwVi?q7AsqPouUe-}oiFWqba_0dL4RR=AvNc8bc__~$l=lPYITF6`!e49vA9Xg(*|ra9=GIk!7PC=Q+)pnOZRUq=GCb)jJ!kR2W1VDD8n#vn+9a{*1#2Y2 z&N3!3OiVhik6IQcu%qME@v7Ae$J7X6)}5iA3#FokCO$VXLVO3z)iVVxxNE=dIBEz? za~ot_Of67=9%<{?CutX$klO!9B|nuiAwpsMVS`#19AV){_VQg@+DTdkr+Vc($!xoh zeVV8<(DO3HfWJjzONN-tRfUI^6DLg-%nu!JD>}QFzXY$xjj&gh0ikmm4rQ_oZD9T# zmAkb~y}q*Atd_QLD-FU6kBYnf3W=~5Dp^q-HRxj>Wu1r%Ch4KMUaR&|C6?_v_i?@u z3r^E0)+_5;_~UdwgX42YQp<@VpQq7pMR5(kE#AuY^kA^xzRt)rSlPZx{YgtVBU$#g%fU9oFl~$LRjTU=drdV^YAK zI9M+(GFkL)2z#Jh-&utb>SH(6uhxh=SdDEviM;w<@M7C8X3wQ|D3Z)Ce-43oe8`VeQToIjDscS*-AKpgn`Wh z7hBYRvz&9gww$b28!iubuvitd6(_fwN=wiAyn~5WPqwMQ{HojcLio|KwN2UDdTwdS ziO%l&9E*qDayoV`^p&O(K2MDt;k4-K$rol$E!fjDvr{K0=B8-D n3*ES-Z+D0=RE4gwbOn!8a{HloqX|zm{n%r)Ym|7D$H@Nyl5yU{ diff --git a/configs/nginx/conf.d/newlms.dot-dot.ru.conf b/configs/nginx/conf.d/newlms.dot-dot.ru.conf index 4862f3a..bcd8e75 100644 --- a/configs/nginx/conf.d/newlms.dot-dot.ru.conf +++ b/configs/nginx/conf.d/newlms.dot-dot.ru.conf @@ -1,23 +1,21 @@ server { listen 80; - server_name staginglms.dot-dot.ru; + server_name newlms.dot-dot.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl ; - server_name staginglms.dot-dot.ru; + server_name newlms.dot-dot.ru; ssl_certificate /etc/nginx/ssl/dot-dot.crt; ssl_certificate_key /etc/nginx/ssl/dot-dot.key; - root /application/public; - client_max_body_size 30m; location / { - proxy_pass http://lms:3000; + proxy_pass http://dot-dot-lms.ru:80; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -27,101 +25,4 @@ server { proxy_buffering off; proxy_cache off; } - - location @rewriteapp { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /logout { - try_files $uri @rewriteapp; - } - - location /api { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /clockwork { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /__clockwork { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /pdf { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /1c { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /socket { - try_files $uri @rewriteapp; - } - - location /admin { - try_files $uri @rewriteapp; - } - - location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ { - proxy_pass http://static; - } - - location /media { - try_files $uri @rewriteapp; - } - - location /img { - proxy_pass http://static; - # alias /application/public/img; - # try_files $uri /index.php$request_uri; - # expires 6M; - } - - location /robots.txt { - proxy_pass http://static; - } - - location /connection/websocket { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://centrifugo; - } - - location /socket.io/auctionreload { - access_log /var/log/nginx/ws_access.log json; - error_log /var/log/nginx/ws_error.log; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Host $host; - proxy_pass http://php:8080/; - } - - location ~ ^/index\.php(/|$) { - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' $http_origin; - add_header 'Access-Control-Allow-Credentials' 'true'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; - add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - - #add_header 'Access-Control-Allow-Origin' $http_origin; - add_header 'Access-Control-Allow-Origin' *; - add_header 'Access-Control-Allow-Credentials' 'true'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; - add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; - - fastcgi_pass backend:9001; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } }