diff --git a/build.backend.bat b/build.backend.bat index a4b3df95b7..a77c10bb22 100644 --- a/build.backend.bat +++ b/build.backend.bat @@ -8,7 +8,7 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( call start\stop.bat nopause -dotnet build ..\asc.web.slnf /fl1 /flp1:logfile=asc.web.log;verbosity=normal +dotnet build ..\server\asc.web.slnf /fl1 /flp1:logfile=asc.web.log;verbosity=normal echo. ) diff --git a/run/ApiSystem.bat b/run/ApiSystem.bat index d1f443674b..e38b907f77 100644 --- a/run/ApiSystem.bat +++ b/run/ApiSystem.bat @@ -1,4 +1,4 @@ @echo off -PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.ApiSystem\bin\Debug\ASC.ApiSystem.exe urls=http://0.0.0.0:5010 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=apisystem pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +PUSHD %~dp0..\..\ +set servicepath=%cd%\server\common\services\ASC.ApiSystem\bin\Debug\ASC.ApiSystem.exe urls=http://0.0.0.0:5010 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=apisystem pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/BackupBackgroundTasks.bat b/run/BackupBackgroundTasks.bat index 0076cc3c35..0a646c7a49 100644 --- a/run/BackupBackgroundTasks.bat +++ b/run/BackupBackgroundTasks.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.Data.Backup.BackgroundTasks\bin\Debug\ASC.Data.Backup.BackgroundTasks.exe urls=http://0.0.0.0:5032 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=backup.backgroundtasks pathToConf=%cd%\config core:products:folder=%cd%\products core:eventBus:subscriptionClientName=asc_event_bus_backup_queue \ No newline at end of file +set servicepath=%cd%\server\common\services\ASC.Data.Backup.BackgroundTasks\bin\Debug\ASC.Data.Backup.BackgroundTasks.exe urls=http://0.0.0.0:5032 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=backup.backgroundtasks pathToConf=%cd%\build\config core:products:folder=%cd%\server\products core:eventBus:subscriptionClientName=asc_event_bus_backup_queue \ No newline at end of file diff --git a/run/BackupService.bat b/run/BackupService.bat index f520403020..06a954f1ee 100644 --- a/run/BackupService.bat +++ b/run/BackupService.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.Data.Backup\bin\Debug\ASC.Data.Backup.exe urls=http://0.0.0.0:5012 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=backup pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\common\services\ASC.Data.Backup\bin\Debug\ASC.Data.Backup.exe urls=http://0.0.0.0:5012 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=backup pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/ClearEvents.bat b/run/ClearEvents.bat index 6a45049d48..0bb9dc2cde 100644 --- a/run/ClearEvents.bat +++ b/run/ClearEvents.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.ClearEvents\bin\Debug\ASC.ClearEvents.exe urls=http://0.0.0.0:5027 $STORAGE_ROOT=%cd%\Data pathToConf=%cd%\config log:dir=%cd%\Logs log:name=clearEvents core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\common\services\ASC.ClearEvents\bin\Debug\ASC.ClearEvents.exe urls=http://0.0.0.0:5027 $STORAGE_ROOT=%cd%\Data pathToConf=%cd%\build\config log:dir=%cd%\Logs log:name=clearEvents core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/FileServer.bat b/run/FileServer.bat index 1774b56767..debc6196b4 100644 --- a/run/FileServer.bat +++ b/run/FileServer.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\products\ASC.Files\Server\bin\Debug\ASC.Files.exe urls=http://0.0.0.0:5007 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\products\ASC.Files\Server\bin\Debug\ASC.Files.exe urls=http://0.0.0.0:5007 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/FileService.bat b/run/FileService.bat index 6e764fd23c..5d5d95d800 100644 --- a/run/FileService.bat +++ b/run/FileService.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\products\ASC.Files\Service\bin\Debug\ASC.Files.Service.exe urls=http://0.0.0.0:5009 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files.service pathToConf=%cd%\config core:products:folder=%cd%\products core:eventBus:subscriptionClientName=asc_event_bus_files_service_queue +set servicepath=%cd%\server\products\ASC.Files\Service\bin\Debug\ASC.Files.Service.exe urls=http://0.0.0.0:5009 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files.service pathToConf=%cd%\build\config core:products:folder=%cd%\server\products core:eventBus:subscriptionClientName=asc_event_bus_files_service_queue diff --git a/run/NotifyService.bat b/run/NotifyService.bat index 699347232b..830c579a57 100644 --- a/run/NotifyService.bat +++ b/run/NotifyService.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.Notify\bin\Debug\ASC.Notify.exe urls=http://0.0.0.0:5005 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=notify pathToConf=%cd%\config core:products:folder=%cd%\products core:eventBus:subscriptionClientName=asc_event_bus_notify_queue \ No newline at end of file +set servicepath=%cd%\server\common\services\ASC.Notify\bin\Debug\ASC.Notify.exe urls=http://0.0.0.0:5005 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=notify pathToConf=%cd%\build\config core:products:folder=%cd%\server\products core:eventBus:subscriptionClientName=asc_event_bus_notify_queue \ No newline at end of file diff --git a/run/PeopleServer.bat b/run/PeopleServer.bat index 30b35f24d9..2675618786 100644 --- a/run/PeopleServer.bat +++ b/run/PeopleServer.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\products\ASC.People\Server\bin\Debug\ASC.People.exe urls=http://0.0.0.0:5004 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=people pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\products\ASC.People\Server\bin\Debug\ASC.People.exe urls=http://0.0.0.0:5004 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=people pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/SocketIO.xml b/run/SocketIO.xml index 558c4db4eb..8f28199ecc 100644 --- a/run/SocketIO.xml +++ b/run/SocketIO.xml @@ -3,7 +3,7 @@ ONLYOFFICE SocketIO manual node - ../../common/ASC.Socket.IO/server.js + ../../server/common/ASC.Socket.IO/server.js true diff --git a/run/SsoAuth.xml b/run/SsoAuth.xml index 6596ec4250..aea247699b 100644 --- a/run/SsoAuth.xml +++ b/run/SsoAuth.xml @@ -3,7 +3,7 @@ ONLYOFFICE SsoAuth manual node - ../../common/ASC.SSoAuth/app.js + ../../server/common/ASC.SSoAuth/app.js true diff --git a/run/StudioNotifyService.bat b/run/StudioNotifyService.bat index 9aca5ebe18..34eb48c85a 100644 --- a/run/StudioNotifyService.bat +++ b/run/StudioNotifyService.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\common\services\ASC.Studio.Notify\bin\Debug\ASC.Studio.Notify.exe urls=http://0.0.0.0:5006 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=studio.notify pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\common\services\ASC.Studio.Notify\bin\Debug\ASC.Studio.Notify.exe urls=http://0.0.0.0:5006 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=studio.notify pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/WebApi.bat b/run/WebApi.bat index dbfe6e528a..29444d81ec 100644 --- a/run/WebApi.bat +++ b/run/WebApi.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\web\ASC.Web.Api\bin\Debug\ASC.Web.Api.exe urls=http://0.0.0.0:5000 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.api pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\web\ASC.Web.Api\bin\Debug\ASC.Web.Api.exe urls=http://0.0.0.0:5000 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.api pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/run/WebDav.xml b/run/WebDav.xml index c156707990..7dce6b2c91 100644 --- a/run/WebDav.xml +++ b/run/WebDav.xml @@ -3,7 +3,7 @@ ONLYOFFICE WebDav Server manual node - ../../common/ASC.WebDav/server/webDavServer.js + ../../server/common/ASC.WebDav/server/webDavServer.js true diff --git a/run/WebHealthChecksUI.bat b/run/WebHealthChecksUI.bat index 0aa219a0ba..7188dc65d1 100644 --- a/run/WebHealthChecksUI.bat +++ b/run/WebHealthChecksUI.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\web\ASC.Web.HealthChecks.UI\bin\Debug\ASC.Web.HealthChecks.UI.exe urls=http://0.0.0.0:5033 \ No newline at end of file +set servicepath=%cd%\server\web\ASC.Web.HealthChecks.UI\bin\Debug\ASC.Web.HealthChecks.UI.exe urls=http://0.0.0.0:5033 \ No newline at end of file diff --git a/run/WebPlugins.xml b/run/WebPlugins.xml index 682055ba2b..b9d989c7e9 100644 --- a/run/WebPlugins.xml +++ b/run/WebPlugins.xml @@ -3,7 +3,7 @@ ONLYOFFICE WebPlugins Server manual node - ../../common/ASC.WebPlugins/dist/src/main.js + ../../server/common/ASC.WebPlugins/dist/src/main.js true diff --git a/run/WebStudio.bat b/run/WebStudio.bat index 52ea4a2c81..187a3a5403 100644 --- a/run/WebStudio.bat +++ b/run/WebStudio.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\web\ASC.Web.Studio\bin\Debug\ASC.Web.Studio.exe urls=http://0.0.0.0:5003 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.studio pathToConf=%cd%\config core:products:folder=%cd%\products \ No newline at end of file +set servicepath=%cd%\server\web\ASC.Web.Studio\bin\Debug\ASC.Web.Studio.exe urls=http://0.0.0.0:5003 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=web.studio pathToConf=%cd%\build\config core:products:folder=%cd%\server\products \ No newline at end of file diff --git a/scripts/plugins.bat b/scripts/plugins.bat index fbf1bc0c36..63bffe050e 100644 --- a/scripts/plugins.bat +++ b/scripts/plugins.bat @@ -1,6 +1,6 @@ PUSHD %~dp0.. -cd %~dp0../../common/ASC.WebPlugins/ +cd %~dp0../../server/common/ASC.WebPlugins/ call yarn install --immutable diff --git a/scripts/socketio.bat b/scripts/socketio.bat index 7ca09ca404..eccae857c3 100644 --- a/scripts/socketio.bat +++ b/scripts/socketio.bat @@ -1,6 +1,6 @@ PUSHD %~dp0.. -cd %~dp0../../common/ASC.Socket.IO/ +cd %~dp0../../server/common/ASC.Socket.IO/ call yarn install --immutable diff --git a/scripts/ssoauth.bat b/scripts/ssoauth.bat index 6d31ba8830..47522a2440 100644 --- a/scripts/ssoauth.bat +++ b/scripts/ssoauth.bat @@ -1,6 +1,6 @@ PUSHD %~dp0.. -cd %~dp0../../common/ASC.SsoAuth/ +cd %~dp0../../server/common/ASC.SsoAuth/ call yarn install --immutable diff --git a/scripts/webdav.bat b/scripts/webdav.bat index 9706c35bc6..823a8bca12 100644 --- a/scripts/webdav.bat +++ b/scripts/webdav.bat @@ -1,6 +1,6 @@ PUSHD %~dp0.. -cd %~dp0../../common/ASC.WebDav/ +cd %~dp0../../server/common/ASC.WebDav/ call yarn install --immutable