Merge branch 'develop' into bugfix/canShare

This commit is contained in:
Alexey Safronov 2021-08-17 13:09:06 +03:00
commit 4d8ab266d4
23 changed files with 128 additions and 36 deletions

View File

@ -6,7 +6,7 @@ call start\stop.bat
PUSHD %~dp0..
echo "FRONT-END"
echo "FRONT-END (for start run command 'yarn start' inside the root folder)"
call build\build.frontend.bat
echo "BACK-END"

View File

@ -1,3 +1,6 @@
PUSHD %~dp0
call runasadmin.bat "%~dpnx0"
if %errorlevel% == 0 (
PUSHD %~dp0..
REM call yarn wipe
@ -9,4 +12,28 @@ call yarn build
REM call yarn wipe
call yarn deploy
pause
REM copy nginx configurations to deploy folder
xcopy config\nginx\onlyoffice.conf build\deploy\nginx\ /E /R /Y
powershell -Command "(gc build\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII build\deploy\nginx\onlyoffice.conf"
xcopy config\nginx\sites-enabled\* build\deploy\nginx\sites-enabled\ /E /R /Y
REM fix paths
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-calendar.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Calendar\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-calendar.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-crm.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.CRM\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-crm.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-editor.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-files.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-files.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\studio\login' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-login.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-mail.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Mail\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-mail.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-people.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.People\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-people.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-projects.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Projects\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-projects.conf"
powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-studio.conf) -replace 'ROOTPATH', '%~dp0deploy\studio\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-studio.conf"
REM restart nginx
call sc stop nginx
REM sleep 5 seconds
call ping 127.0.0.1 -n 6 > nul
call sc start nginx
)

18
build/buildAndDeploy.bat Normal file
View File

@ -0,0 +1,18 @@
PUSHD %~dp0
call runasadmin.bat "%~dpnx0"
if %errorlevel% == 0 (
call start\stop.bat
PUSHD %~dp0..
echo "FRONT-END static"
call build\build.static.bat
echo "BACK-END"
call build\build.backend.bat
start /b call build\start\start.bat
pause
)

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Calendar"
call set BROWSER=none&&npm start --prefix ../../products/ASC.Calendar/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.CRM"
call set BROWSER=none&&npm start --prefix ../../products/ASC.CRM/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Files"
call set BROWSER=none&&npm start --prefix ../../products/ASC.Files/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Mail"
call set BROWSER=none&&npm start --prefix ../../products/ASC.Mail/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Studio"
call set BROWSER=none&&npm start --prefix ../../products/ASC.People/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Projects"
call set BROWSER=none&&npm start --prefix ../../products/ASC.Projects/Client

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Studio"
call set BROWSER=none&&npm start --prefix ../../web/ASC.Web.Client/

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Editor"
call set BROWSER=none&&npm start --prefix ../../web/ASC.Web.Editor/

View File

@ -1,2 +0,0 @@
echo "RUN ASC.Web.Login"
call set BROWSER=none&&npm start --prefix ../../web/ASC.Web.Login/

View File

@ -1,8 +0,0 @@
PUSHD %~dp0..
call runasadmin.bat "%~dpnx0"
if %errorlevel% == 0 (
for /f %%f in ('dir /b run ^| findstr /v /i "\Client.bat$"') do (
call nssm start Onlyoffice%%~nf
)
)

View File

@ -1,8 +0,0 @@
PUSHD %~dp0..
call runasadmin.bat "%~dpnx0"
if %errorlevel% == 0 (
for /f %%f in ('dir /b run ^| findstr /v /i "\Client.bat$"') do (
call nssm stop Onlyoffice%%~nf
)
)

View File

@ -0,0 +1,9 @@
server {
listen 5017;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5014;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5013;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5008;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5011;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5016;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5002;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5015;
root "ROOTPATH";
index index.html;
location /products/projects {
try_files $uri /index.html =404;
}
}

View File

@ -0,0 +1,9 @@
server {
listen 5001;
root "ROOTPATH";
index index.html;
location / {
try_files $uri /index.html =404;
}
}