From 09466caed006648aec57f55d9ffec304c9d39833 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Mon, 2 Oct 2023 13:16:45 +0300 Subject: [PATCH] moved config to build/condig folder --- {config => build/config}/activemq.test.json | 0 {config => build/config}/apicache.json | 0 {config => build/config}/apisystem.dev.json | 0 {config => build/config}/apisystem.json | 98 +- {config => build/config}/appsettings.dev.json | 0 {config => build/config}/appsettings.json | 0 .../config}/appsettings.services.json | 0 .../config}/appsettings.test.json | 98 +- .../config}/autofac.consumers.json | 1200 ++++++++--------- {config => build/config}/autofac.json | 24 +- .../config}/autofac.products.json | 44 +- {config => build/config}/backup.json | 0 {config => build/config}/elastic.json | 0 {config => build/config}/elastic.test.json | 0 {config => build/config}/feed.json | 0 {config => build/config}/kafka.json | 0 {config => build/config}/kafka.test.json | 8 +- {config => build/config}/nginx/batch.js | 120 +- .../nginx/includes/onlyoffice-public.conf | 4 +- .../config}/nginx/onlyoffice-client.conf | 16 +- .../config}/nginx/onlyoffice-login.conf | 16 +- .../config}/nginx/onlyoffice-story.conf | 8 +- .../config}/nginx/onlyoffice.conf | 640 ++++----- .../config}/nginx/proxy-frontend-virt.conf | 0 .../config}/nginx/proxy-frontend.conf | 0 .../sites-enabled/onlyoffice-client.conf | 0 {config => build/config}/nlog.config | 112 +- {config => build/config}/notify.json | 50 +- {config => build/config}/plugins.json | 0 {config => build/config}/rabbitmq.json | 0 {config => build/config}/rabbitmq.test.json | 0 {config => build/config}/radicale.config | 0 {config => build/config}/radicale.log.config | 0 {config => build/config}/radicale.rights | 0 {config => build/config}/redis.json | 0 {config => build/config}/socket.json | 0 {config => build/config}/socket.test.json | 0 {config => build/config}/ssoauth.json | 0 {config => build/config}/storage.json | 266 ++-- {config => build/config}/thumb.json | 0 {config => build/config}/thumb.test.json | 8 +- .../config}/urlshortener.test.json | 8 +- 42 files changed, 1360 insertions(+), 1360 deletions(-) rename {config => build/config}/activemq.test.json (100%) rename {config => build/config}/apicache.json (100%) rename {config => build/config}/apisystem.dev.json (100%) rename {config => build/config}/apisystem.json (95%) rename {config => build/config}/appsettings.dev.json (100%) rename {config => build/config}/appsettings.json (100%) rename {config => build/config}/appsettings.services.json (100%) rename {config => build/config}/appsettings.test.json (96%) rename {config => build/config}/autofac.consumers.json (96%) rename {config => build/config}/autofac.json (94%) rename {config => build/config}/autofac.products.json (95%) rename {config => build/config}/backup.json (100%) rename {config => build/config}/elastic.json (100%) rename {config => build/config}/elastic.test.json (100%) rename {config => build/config}/feed.json (100%) rename {config => build/config}/kafka.json (100%) rename {config => build/config}/kafka.test.json (93%) rename {config => build/config}/nginx/batch.js (96%) rename {config => build/config}/nginx/includes/onlyoffice-public.conf (96%) rename {config => build/config}/nginx/onlyoffice-client.conf (93%) rename {config => build/config}/nginx/onlyoffice-login.conf (93%) rename {config => build/config}/nginx/onlyoffice-story.conf (94%) rename {config => build/config}/nginx/onlyoffice.conf (96%) rename {config => build/config}/nginx/proxy-frontend-virt.conf (100%) rename {config => build/config}/nginx/proxy-frontend.conf (100%) rename {config => build/config}/nginx/sites-enabled/onlyoffice-client.conf (100%) rename {config => build/config}/nlog.config (98%) rename {config => build/config}/notify.json (95%) rename {config => build/config}/plugins.json (100%) rename {config => build/config}/rabbitmq.json (100%) rename {config => build/config}/rabbitmq.test.json (100%) rename {config => build/config}/radicale.config (100%) rename {config => build/config}/radicale.log.config (100%) rename {config => build/config}/radicale.rights (100%) rename {config => build/config}/redis.json (100%) rename {config => build/config}/socket.json (100%) rename {config => build/config}/socket.test.json (100%) rename {config => build/config}/ssoauth.json (100%) rename {config => build/config}/storage.json (96%) rename {config => build/config}/thumb.json (100%) rename {config => build/config}/thumb.test.json (91%) rename {config => build/config}/urlshortener.test.json (93%) diff --git a/config/activemq.test.json b/build/config/activemq.test.json similarity index 100% rename from config/activemq.test.json rename to build/config/activemq.test.json diff --git a/config/apicache.json b/build/config/apicache.json similarity index 100% rename from config/apicache.json rename to build/config/apicache.json diff --git a/config/apisystem.dev.json b/build/config/apisystem.dev.json similarity index 100% rename from config/apisystem.dev.json rename to build/config/apisystem.dev.json diff --git a/config/apisystem.json b/build/config/apisystem.json similarity index 95% rename from config/apisystem.json rename to build/config/apisystem.json index f5f97c85ec..b41755057d 100644 --- a/config/apisystem.json +++ b/build/config/apisystem.json @@ -1,50 +1,50 @@ -{ - "core": { - "base-domain":"localhost", - "machinekey": "1123askdasjklasbnd", - "notify": { - "postman": "log" - }, - "payment-partners" : "", - "username" : { - "regex" : "^[\\p{L}\\p{M}' \\-]+$" - } - }, - "web": { - "alias" : { - "min" : 3 - }, - "api-cache": "", - "autotest" : { - "secret-email" : "" - }, - "app": { - "keys": "" - } - }, - "recaptcha" : { - "required" : false, - "private-key" : { - "default" : "", - "android": "", - "ios": "" - } - }, - "auth" : { - "allowskip" : { - "default" : false, - "registerportal": true - } - }, - "ConnectionStrings": { - "default": { - "name": "default", - "connectionString": "Server=localhost;Database=docspace;User ID=dev;Password=dev;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=True;ConnectionReset=false", - "providerName": "MySql.Data.MySqlClient" - } - }, - "quota": { - "id": -3 - }, - "max-attempts-count" : 10 +{ + "core": { + "base-domain":"localhost", + "machinekey": "1123askdasjklasbnd", + "notify": { + "postman": "log" + }, + "payment-partners" : "", + "username" : { + "regex" : "^[\\p{L}\\p{M}' \\-]+$" + } + }, + "web": { + "alias" : { + "min" : 3 + }, + "api-cache": "", + "autotest" : { + "secret-email" : "" + }, + "app": { + "keys": "" + } + }, + "recaptcha" : { + "required" : false, + "private-key" : { + "default" : "", + "android": "", + "ios": "" + } + }, + "auth" : { + "allowskip" : { + "default" : false, + "registerportal": true + } + }, + "ConnectionStrings": { + "default": { + "name": "default", + "connectionString": "Server=localhost;Database=docspace;User ID=dev;Password=dev;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=True;ConnectionReset=false", + "providerName": "MySql.Data.MySqlClient" + } + }, + "quota": { + "id": -3 + }, + "max-attempts-count" : 10 } \ No newline at end of file diff --git a/config/appsettings.dev.json b/build/config/appsettings.dev.json similarity index 100% rename from config/appsettings.dev.json rename to build/config/appsettings.dev.json diff --git a/config/appsettings.json b/build/config/appsettings.json similarity index 100% rename from config/appsettings.json rename to build/config/appsettings.json diff --git a/config/appsettings.services.json b/build/config/appsettings.services.json similarity index 100% rename from config/appsettings.services.json rename to build/config/appsettings.services.json diff --git a/config/appsettings.test.json b/build/config/appsettings.test.json similarity index 96% rename from config/appsettings.test.json rename to build/config/appsettings.test.json index 3a4d202465..959d54b450 100644 --- a/config/appsettings.test.json +++ b/build/config/appsettings.test.json @@ -1,49 +1,49 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "ConnectionStrings": { - "default": { - "name": "default", - "connectionString": "Server=172.18.0.2;Port=3306;Database=docspace;User ID=onlyoffice_user;Password=onlyoffice_pass;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;ConnectionReset=false", - "providerName": "MySql.Data.MySqlClient" - } - }, - "core": { - "base-domain": "localhost", - "machinekey": "1VVAepxpW8f7", - "products": { - "folder": "../../products", - "subfolder": "server" - }, - "notify": { - "postman": "services" - } - }, - "files": { - "docservice": { - "secret" : { - "value": "SQyTqextlJFq", - "header": "AuthorizationJwt" - }, - "url": { - "public": "/ds-vpath/", - "internal": "http://172.18.0.6/", - "portal": "https://dotnet.onlyoffice.com:8093/" - } - }, - "ffmpeg" : - { - "value": "ffmpeg", - "exts": [ "avi", "mpeg", "mpg", "wmv" ] - }, - "viewed-media": [ ".aac",".flac",".m4a",".mp3",".oga",".ogg",".wav",".f4v",".m4v",".mov",".mp4",".ogv",".webm",".avi" ], - "thirdparty": { - "enable": [ "box", "dropboxv2", "docusign", "google", "onedrive", "nextcloud", "owncloud", "webdav", "kdrive", "yandex" ] - } - } -} +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "ConnectionStrings": { + "default": { + "name": "default", + "connectionString": "Server=172.18.0.2;Port=3306;Database=docspace;User ID=onlyoffice_user;Password=onlyoffice_pass;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;ConnectionReset=false", + "providerName": "MySql.Data.MySqlClient" + } + }, + "core": { + "base-domain": "localhost", + "machinekey": "1VVAepxpW8f7", + "products": { + "folder": "../../products", + "subfolder": "server" + }, + "notify": { + "postman": "services" + } + }, + "files": { + "docservice": { + "secret" : { + "value": "SQyTqextlJFq", + "header": "AuthorizationJwt" + }, + "url": { + "public": "/ds-vpath/", + "internal": "http://172.18.0.6/", + "portal": "https://dotnet.onlyoffice.com:8093/" + } + }, + "ffmpeg" : + { + "value": "ffmpeg", + "exts": [ "avi", "mpeg", "mpg", "wmv" ] + }, + "viewed-media": [ ".aac",".flac",".m4a",".mp3",".oga",".ogg",".wav",".f4v",".m4v",".mov",".mp4",".ogv",".webm",".avi" ], + "thirdparty": { + "enable": [ "box", "dropboxv2", "docusign", "google", "onedrive", "nextcloud", "owncloud", "webdav", "kdrive", "yandex" ] + } + } +} diff --git a/config/autofac.consumers.json b/build/config/autofac.consumers.json similarity index 96% rename from config/autofac.consumers.json rename to build/config/autofac.consumers.json index ef294929ce..da6d4456a6 100644 --- a/config/autofac.consumers.json +++ b/build/config/autofac.consumers.json @@ -1,600 +1,600 @@ -{ - "components": [ - { - "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin" - }, - { - "key": "appleid", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "appleid", - "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "appleID", - "order": "13", - "props": { - "appleIdClientId": "", - "appleIdClientIdMobile": "", - "appleIdTeamId": "", - "appleIdKeyId": "", - "appleIdPrivateKey": "" - }, - "additional": { - "appleIdRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin" - }, - { - "key": "bitly", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "bitly", - "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "bitly", - "order": "13", - "props": { - "bitlyToken": "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin" - }, - { - "key": "box", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "box", - "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "box", - "order": "3", - "props": { - "boxClientId": "", - "boxClientSecret": "" - }, - "additional": { - "boxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core" - }, - { - "key": "clickatell", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "clickatell", - "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "clickatell", - "order": "10", - "props": { - "clickatellapiKey": "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin" - }, - { - "key": "dropbox", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "dropbox", - "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "dropbox", - "order": "2", - "props": { - "dropboxClientId": "", - "dropboxClientSecret": "" - }, - "additional": { - "dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx", - "dropboxappkey" : "", - "dropboxappsecret" : "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin" - }, - { - "key": "facebook", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "facebook", - "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "facebook", - "order": "6", - "props": { - "facebookClientId": "", - "facebookClientSecret": "" - }, - "additional": { - "facebookRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin" - }, - { - "key": "twitter", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "twitter", - "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "twitter", - "order": "6", - "props": { - "twitterKey": "", - "twitterSecret": "" - }, - "additional": { - "twitterRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core" - }, - { - "key": "firebase", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "firebase", - "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "firebase", - "order": "12", - "props": { - "firebase_apiKey": "", - "firebase_projectId": "", - "firebase_messagingSenderId": "", - "firebase_authorization": "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin" - }, - { - "key": "google", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "google", - "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "google", - "order": "5", - "props": { - "googleClientId": "", - "googleClientSecret": "" - }, - "additional": { - "googleRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin" - }, - { - "key": "linkedin", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "linkedin", - "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "linkedin", - "order": "8", - "props": { - "linkedInKey": "", - "linkedInSecret": "" - }, - "additional": { - "linkedInRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin" - }, - { - "key": "skydrive", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "skydrive", - "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "skydrive", - "order": "4", - "props": { - "skydriveappkey": "", - "skydriveappsecret": "" - }, - "additional": { - "skydriveRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin" - }, - { - "key": "microsoft", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "microsoft", - "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "microsoft", - "order": "4", - "props": { - "microsoftClientId": "", - "microsoftClientSecret": "" - }, - "additional": { - "microsoftRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core" - }, - { - "key": "twilio", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "twilio", - "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "twilio", - "order": "9", - "props": { - "twilioAccountSid": "", - "twilioAuthToken": "", - "twiliosender": "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin" - }, - { - "key": "wordpress", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "wordpress", - "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "wordpress", - "order": "15", - "props": { - "wpClientId": "", - "wpClientSecret": "" - }, - "additional": { - "wpRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" - } - } - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - }, - { - "key": "s3", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "s3", - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "s3", - "order": "20", - "props": { - "acesskey": "", - "secretaccesskey": "" - }, - "additional": { - "handlerType" : "ASC.Data.Storage.S3.S3Storage, ASC.Data.Storage", - "bucket" : "", - "region" : "", - "serviceurl": "", - "forcepathstyle": "", - "usehttp": "", - "sse": "", - "ssekey": "", - "cdn": "S3Cdn" - } - } - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - }, - { - "key": "googlecloud", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "googlecloud", - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "googlecloud", - "order": "21", - "props": { - "json": "" - }, - "additional": { - "handlerType" : "ASC.Data.Storage.GoogleCloud.GoogleCloudStorage, ASC.Data.Storage", - "bucket" : "" - } - } - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - }, - { - "key": "rackspace", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "rackspace", - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "rackspace", - "order": "22", - "props": { - "username": "", - "apiKey": "" - }, - "additional": { - "handlerType" : "ASC.Data.Storage.RackspaceCloud.RackspaceCloudStorage, ASC.Data.Storage", - "public_container" : "", - "private_container" : "", - "region" : "" - } - } - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - }, - { - "key": "selectel", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "selectel", - "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "selectel", - "order": "23", - "props": { - "authUser": "", - "authPwd": "" - }, - "additional": { - "handlerType" : "ASC.Data.Storage.Selectel.SelectelStorage, ASC.Data.Storage", - "public_container" : "", - "private_container" : "" - } - } - }, - { - "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin", - "services": [ - { - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin" - }, - { - "key": "zoom", - "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" - }, - { - "key": "zoom", - "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin" - } - ], - "instanceScope": "perlifetimescope", - "parameters": { - "name": "zoom", - "order": "24", - "props": { - "zoomClientId": "", - "zoomClientSecret": "" - }, - "additional": { - "zoomRedirectUrl": "https://service.teamlab.info/oauth2.aspx" - } - } - } - ] -} +{ + "components": [ + { + "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin" + }, + { + "key": "appleid", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "appleid", + "type": "ASC.FederatedLogin.LoginProviders.AppleIdLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "appleID", + "order": "13", + "props": { + "appleIdClientId": "", + "appleIdClientIdMobile": "", + "appleIdTeamId": "", + "appleIdKeyId": "", + "appleIdPrivateKey": "" + }, + "additional": { + "appleIdRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin" + }, + { + "key": "bitly", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "bitly", + "type": "ASC.FederatedLogin.LoginProviders.BitlyLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "bitly", + "order": "13", + "props": { + "bitlyToken": "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin" + }, + { + "key": "box", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "box", + "type": "ASC.FederatedLogin.LoginProviders.BoxLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "box", + "order": "3", + "props": { + "boxClientId": "", + "boxClientSecret": "" + }, + "additional": { + "boxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core" + }, + { + "key": "clickatell", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "clickatell", + "type": "ASC.Web.Core.Sms.ClickatellProvider, ASC.Web.Core" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "clickatell", + "order": "10", + "props": { + "clickatellapiKey": "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin" + }, + { + "key": "dropbox", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "dropbox", + "type": "ASC.FederatedLogin.LoginProviders.DropboxLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "dropbox", + "order": "2", + "props": { + "dropboxClientId": "", + "dropboxClientSecret": "" + }, + "additional": { + "dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx", + "dropboxappkey" : "", + "dropboxappsecret" : "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin" + }, + { + "key": "facebook", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "facebook", + "type": "ASC.FederatedLogin.LoginProviders.FacebookLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "facebook", + "order": "6", + "props": { + "facebookClientId": "", + "facebookClientSecret": "" + }, + "additional": { + "facebookRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin" + }, + { + "key": "twitter", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "twitter", + "type": "ASC.FederatedLogin.LoginProviders.TwitterLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "twitter", + "order": "6", + "props": { + "twitterKey": "", + "twitterSecret": "" + }, + "additional": { + "twitterRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core" + }, + { + "key": "firebase", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "firebase", + "type": "ASC.Web.Core.Jabber.FireBase, ASC.Web.Core" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "firebase", + "order": "12", + "props": { + "firebase_apiKey": "", + "firebase_projectId": "", + "firebase_messagingSenderId": "", + "firebase_authorization": "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin" + }, + { + "key": "google", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "google", + "type": "ASC.FederatedLogin.LoginProviders.GoogleLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "google", + "order": "5", + "props": { + "googleClientId": "", + "googleClientSecret": "" + }, + "additional": { + "googleRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin" + }, + { + "key": "linkedin", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "linkedin", + "type": "ASC.FederatedLogin.LoginProviders.LinkedInLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "linkedin", + "order": "8", + "props": { + "linkedInKey": "", + "linkedInSecret": "" + }, + "additional": { + "linkedInRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin" + }, + { + "key": "skydrive", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "skydrive", + "type": "ASC.FederatedLogin.LoginProviders.OneDriveLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "skydrive", + "order": "4", + "props": { + "skydriveappkey": "", + "skydriveappsecret": "" + }, + "additional": { + "skydriveRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin" + }, + { + "key": "microsoft", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "microsoft", + "type": "ASC.FederatedLogin.LoginProviders.MicrosoftLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "microsoft", + "order": "4", + "props": { + "microsoftClientId": "", + "microsoftClientSecret": "" + }, + "additional": { + "microsoftRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core" + }, + { + "key": "twilio", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "twilio", + "type": "ASC.Web.Core.Sms.TwilioProvider, ASC.Web.Core" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "twilio", + "order": "9", + "props": { + "twilioAccountSid": "", + "twilioAuthToken": "", + "twiliosender": "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin" + }, + { + "key": "wordpress", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "wordpress", + "type": "ASC.FederatedLogin.LoginProviders.WordpressLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "wordpress", + "order": "15", + "props": { + "wpClientId": "", + "wpClientSecret": "" + }, + "additional": { + "wpRedirectUrl" : "https://service.teamlab.info/oauth2.aspx" + } + } + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + }, + { + "key": "s3", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "s3", + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "s3", + "order": "20", + "props": { + "acesskey": "", + "secretaccesskey": "" + }, + "additional": { + "handlerType" : "ASC.Data.Storage.S3.S3Storage, ASC.Data.Storage", + "bucket" : "", + "region" : "", + "serviceurl": "", + "forcepathstyle": "", + "usehttp": "", + "sse": "", + "ssekey": "", + "cdn": "S3Cdn" + } + } + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + }, + { + "key": "googlecloud", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "googlecloud", + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "googlecloud", + "order": "21", + "props": { + "json": "" + }, + "additional": { + "handlerType" : "ASC.Data.Storage.GoogleCloud.GoogleCloudStorage, ASC.Data.Storage", + "bucket" : "" + } + } + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + }, + { + "key": "rackspace", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "rackspace", + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "rackspace", + "order": "22", + "props": { + "username": "", + "apiKey": "" + }, + "additional": { + "handlerType" : "ASC.Data.Storage.RackspaceCloud.RackspaceCloudStorage, ASC.Data.Storage", + "public_container" : "", + "private_container" : "", + "region" : "" + } + } + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + }, + { + "key": "selectel", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "selectel", + "type": "ASC.Core.Common.Configuration.DataStoreConsumer, ASC.Core.Common" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "selectel", + "order": "23", + "props": { + "authUser": "", + "authPwd": "" + }, + "additional": { + "handlerType" : "ASC.Data.Storage.Selectel.SelectelStorage, ASC.Data.Storage", + "public_container" : "", + "private_container" : "" + } + } + }, + { + "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin", + "services": [ + { + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin" + }, + { + "key": "zoom", + "type": "ASC.Core.Common.Configuration.Consumer, ASC.Core.Common" + }, + { + "key": "zoom", + "type": "ASC.FederatedLogin.LoginProviders.ZoomLoginProvider, ASC.FederatedLogin" + } + ], + "instanceScope": "perlifetimescope", + "parameters": { + "name": "zoom", + "order": "24", + "props": { + "zoomClientId": "", + "zoomClientSecret": "" + }, + "additional": { + "zoomRedirectUrl": "https://service.teamlab.info/oauth2.aspx" + } + } + } + ] +} diff --git a/config/autofac.json b/build/config/autofac.json similarity index 94% rename from config/autofac.json rename to build/config/autofac.json index 23eac79824..e1f0163bc6 100644 --- a/config/autofac.json +++ b/build/config/autofac.json @@ -1,12 +1,12 @@ -{ - "components": [ - { - "type": "ASC.Data.Encryption.Crypt, ASC.Data.Encryption", - "services": [ - { - "type": "ASC.Core.Encryption.ICrypt, ASC.Core.Common" - } - ] - } - ] -} +{ + "components": [ + { + "type": "ASC.Data.Encryption.Crypt, ASC.Data.Encryption", + "services": [ + { + "type": "ASC.Core.Encryption.ICrypt, ASC.Core.Common" + } + ] + } + ] +} diff --git a/config/autofac.products.json b/build/config/autofac.products.json similarity index 95% rename from config/autofac.products.json rename to build/config/autofac.products.json index f08a8c6a83..93204a6d72 100644 --- a/config/autofac.products.json +++ b/build/config/autofac.products.json @@ -1,22 +1,22 @@ -{ - "components": [ - { - "type": "ASC.People.PeopleProduct, ASC.People", - "services": [ - { - "type": "ASC.Web.Core.IWebItem, ASC.Web.Core" - } - ], - "instanceScope": "InstancePerLifetimeScope" - }, - { - "type": "ASC.Files.ApiProductEntryPoint, ASC.Files", - "services": [ - { - "type": "ASC.Web.Core.IWebItem, ASC.Web.Core" - } - ], - "instanceScope": "InstancePerLifetimeScope" - } - ] -} +{ + "components": [ + { + "type": "ASC.People.PeopleProduct, ASC.People", + "services": [ + { + "type": "ASC.Web.Core.IWebItem, ASC.Web.Core" + } + ], + "instanceScope": "InstancePerLifetimeScope" + }, + { + "type": "ASC.Files.ApiProductEntryPoint, ASC.Files", + "services": [ + { + "type": "ASC.Web.Core.IWebItem, ASC.Web.Core" + } + ], + "instanceScope": "InstancePerLifetimeScope" + } + ] +} diff --git a/config/backup.json b/build/config/backup.json similarity index 100% rename from config/backup.json rename to build/config/backup.json diff --git a/config/elastic.json b/build/config/elastic.json similarity index 100% rename from config/elastic.json rename to build/config/elastic.json diff --git a/config/elastic.test.json b/build/config/elastic.test.json similarity index 100% rename from config/elastic.test.json rename to build/config/elastic.test.json diff --git a/config/feed.json b/build/config/feed.json similarity index 100% rename from config/feed.json rename to build/config/feed.json diff --git a/config/kafka.json b/build/config/kafka.json similarity index 100% rename from config/kafka.json rename to build/config/kafka.json diff --git a/config/kafka.test.json b/build/config/kafka.test.json similarity index 93% rename from config/kafka.test.json rename to build/config/kafka.test.json index 108d04dd46..bfc14b39ad 100644 --- a/config/kafka.test.json +++ b/build/config/kafka.test.json @@ -1,5 +1,5 @@ -{ - "kafka": { - "BootstrapServers": "localhost:9092" - } +{ + "kafka": { + "BootstrapServers": "localhost:9092" + } } \ No newline at end of file diff --git a/config/nginx/batch.js b/build/config/nginx/batch.js similarity index 96% rename from config/nginx/batch.js rename to build/config/nginx/batch.js index d8eb74720e..4d97701add 100644 --- a/config/nginx/batch.js +++ b/build/config/nginx/batch.js @@ -1,61 +1,61 @@ -function batchJSON(request) { - batch(request, { serialize: JSON.stringify, contentType: "application/json; charset=utf-8"}); -} - -function batchXML(request) { - batch(request, { serialize: OBJtoXML, contentType: "application/xml; charset=utf-8"}); -} - -function batch(request, serialiazer) { - var body = JSON.parse(request.requestBody).batch; - var n = 0; - var result = { - count: body.length, - status: 0, - statusCode: 200, - response: [] - }; - - function done(i, reply) { - result.response[i] = { - status: reply.status, - data: reply.responseBody - }; - - if (++n == body.length) { - var response = serialiazer.serialize(result); - request.status = 200; - request.headersOut['Content-Type'] = serialiazer.contentType; - request.headersOut['Content-Length'] = response.length; - request.sendHeader(); - request.send(response); - request.finish(); - } - } - - - for(var i in body) { - request.subrequest(body[i].RelativeUrl, { method : body[i].RelativeMethod }, done.bind(null, i)); - } -} - -function OBJtoXML(obj) { - var xml = ''; - for (var prop in obj) { - xml += obj[prop] instanceof Array ? '' : "<" + prop + ">"; - if (obj[prop] instanceof Array) { - for (var array in obj[prop]) { - xml += "<" + prop + ">"; - xml += OBJtoXML(new Object(obj[prop][array])); - xml += ""; - } - } else if (typeof obj[prop] == "object") { - xml += OBJtoXML(new Object(obj[prop])); - } else { - xml += obj[prop]; - } - xml += obj[prop] instanceof Array ? '' : ""; - } - var xml = xml.replace(/<\/?[0-9]{1,}>/g, ''); - return xml +function batchJSON(request) { + batch(request, { serialize: JSON.stringify, contentType: "application/json; charset=utf-8"}); +} + +function batchXML(request) { + batch(request, { serialize: OBJtoXML, contentType: "application/xml; charset=utf-8"}); +} + +function batch(request, serialiazer) { + var body = JSON.parse(request.requestBody).batch; + var n = 0; + var result = { + count: body.length, + status: 0, + statusCode: 200, + response: [] + }; + + function done(i, reply) { + result.response[i] = { + status: reply.status, + data: reply.responseBody + }; + + if (++n == body.length) { + var response = serialiazer.serialize(result); + request.status = 200; + request.headersOut['Content-Type'] = serialiazer.contentType; + request.headersOut['Content-Length'] = response.length; + request.sendHeader(); + request.send(response); + request.finish(); + } + } + + + for(var i in body) { + request.subrequest(body[i].RelativeUrl, { method : body[i].RelativeMethod }, done.bind(null, i)); + } +} + +function OBJtoXML(obj) { + var xml = ''; + for (var prop in obj) { + xml += obj[prop] instanceof Array ? '' : "<" + prop + ">"; + if (obj[prop] instanceof Array) { + for (var array in obj[prop]) { + xml += "<" + prop + ">"; + xml += OBJtoXML(new Object(obj[prop][array])); + xml += ""; + } + } else if (typeof obj[prop] == "object") { + xml += OBJtoXML(new Object(obj[prop])); + } else { + xml += obj[prop]; + } + xml += obj[prop] instanceof Array ? '' : ""; + } + var xml = xml.replace(/<\/?[0-9]{1,}>/g, ''); + return xml } \ No newline at end of file diff --git a/config/nginx/includes/onlyoffice-public.conf b/build/config/nginx/includes/onlyoffice-public.conf similarity index 96% rename from config/nginx/includes/onlyoffice-public.conf rename to build/config/nginx/includes/onlyoffice-public.conf index c303c291c2..9c22372371 100644 --- a/config/nginx/includes/onlyoffice-public.conf +++ b/build/config/nginx/includes/onlyoffice-public.conf @@ -1,3 +1,3 @@ -map $document_root $public_root { - default /var/www/public/; +map $document_root $public_root { + default /var/www/public/; } \ No newline at end of file diff --git a/config/nginx/onlyoffice-client.conf b/build/config/nginx/onlyoffice-client.conf similarity index 93% rename from config/nginx/onlyoffice-client.conf rename to build/config/nginx/onlyoffice-client.conf index 2388d166a2..aa8e811f3c 100644 --- a/config/nginx/onlyoffice-client.conf +++ b/build/config/nginx/onlyoffice-client.conf @@ -1,9 +1,9 @@ -server { - listen 5001; - root /var/www/client; - index index.html; - - location / { - try_files $uri /index.html =404; - } +server { + listen 5001; + root /var/www/client; + index index.html; + + location / { + try_files $uri /index.html =404; + } } \ No newline at end of file diff --git a/config/nginx/onlyoffice-login.conf b/build/config/nginx/onlyoffice-login.conf similarity index 93% rename from config/nginx/onlyoffice-login.conf rename to build/config/nginx/onlyoffice-login.conf index 9a3d24d70e..69ad5e7af5 100644 --- a/config/nginx/onlyoffice-login.conf +++ b/build/config/nginx/onlyoffice-login.conf @@ -1,9 +1,9 @@ -server { - listen 5011; - root /var/www/login; - index index.html; - - location / { - try_files $uri /index.html =404; - } +server { + listen 5011; + root /var/www/login; + index index.html; + + location / { + try_files $uri /index.html =404; + } } \ No newline at end of file diff --git a/config/nginx/onlyoffice-story.conf b/build/config/nginx/onlyoffice-story.conf similarity index 94% rename from config/nginx/onlyoffice-story.conf rename to build/config/nginx/onlyoffice-story.conf index 1c4a32f220..cf55b453f7 100644 --- a/config/nginx/onlyoffice-story.conf +++ b/build/config/nginx/onlyoffice-story.conf @@ -1,5 +1,5 @@ -server { - listen 8081; - root /var/www/story; - index index.html; +server { + listen 8081; + root /var/www/story; + index index.html; } \ No newline at end of file diff --git a/config/nginx/onlyoffice.conf b/build/config/nginx/onlyoffice.conf similarity index 96% rename from config/nginx/onlyoffice.conf rename to build/config/nginx/onlyoffice.conf index b15f8ab0c2..15c7bf5c12 100644 --- a/config/nginx/onlyoffice.conf +++ b/build/config/nginx/onlyoffice.conf @@ -1,320 +1,320 @@ -map $http_host $this_host { - "" $host; - default $http_host; -} - -map $http_cloudfront_forwarded_proto $cloudfront_forwarded_proto { - default $http_cloudfront_forwarded_proto; - "" $scheme; -} - -map $http_x_forwarded_proto $proxy_x_forwarded_proto { - default $http_x_forwarded_proto; - "" $cloudfront_forwarded_proto; -} - -map $http_x_forwarded_port $proxy_x_forwarded_port { - default $http_x_forwarded_port; - '' $server_port; -} - -map $http_x_forwarded_host $proxy_x_forwarded_host { - default $http_x_forwarded_host; - "" $this_host; -} - -map $scheme $proxy_x_forwarded_ssl { - default off; - https on; -} - -map $http_upgrade $proxy_connection { - default upgrade; - '' close; -} - -map $uri $basename { - ~/(?[^/]*)$ $captured_basename; -} - -map $request_uri $header_x_frame_options { - ~*^/(favicon\.ico|products\/files\/share|products\/files\/saveas|products\/files\/filechoice|products\/files\/doceditor|thirdparty\/plugin) ""; - default "SAMEORIGIN"; -} - -map $request_uri $cache_control { - default "no-cache, no-store, no-transform"; - ~*\/(filehandler\.ashx\?action=(thumb|preview))|\/(storage\/room_logos\/root\/|storage\/userPhotos\/root\/) "must-revalidate, no-transform, immutable, max-age=31536000"; - ~*\/(api\/2\.0.*|storage|login\.ashx|filehandler\.ashx|ChunkedUploader.ashx|ThirdPartyAppHandler|apisystem|sh|remoteEntry\.js|debuginfo\.md|static\/scripts.*) "no-cache, no-store, no-transform"; - ~*\/(images|favicon.ico.*)|\.(js|woff|woff2|css)|(locales.*\.json) "must-revalidate, no-transform, immutable, max-age=31536000"; -} - -include /etc/nginx/includes/onlyoffice-*.conf; - -server_names_hash_bucket_size 128; - -server { - listen 8092; - - add_header Referrer-Policy "same-origin"; - add_header X-Content-Type-Options "nosniff"; - add_header X-Frame-Options $header_x_frame_options; - add_header Cache-Control $cache_control; - root $public_root; - etag on; - - large_client_header_buffers 4 16k; - client_max_body_size 4G; - - gzip on; - gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript; - - fastcgi_read_timeout 600; - fastcgi_send_timeout 600; - fastcgi_keep_conn on; - fastcgi_intercept_errors on; - - include fastcgi_params; - - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO ""; - - proxy_http_version 1.1; - proxy_set_header Host $this_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; - proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl; - proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $proxy_connection; - proxy_set_header Proxy ""; - - set $csp ""; - access_by_lua ' - if ngx.req.get_method() == "GET" then - local key = string.format("csp:%s",ngx.var.host) - local redis = require "resty.redis" - local red = redis:new() - local redis_host = "127.0.0.1" - local redis_port = 6379 - - red:set_timeout(1000) -- 1 second - - local ok, err = red:connect(redis_host, redis_port) - if not ok then - ngx.log(ngx.ERR, "failed to connect to redis: ", err) - end - - local csp, err = red:hget(key, "data") - - if csp == ngx.null then - ngx.log(ngx.ERR, "failed to get redis key: ", err) - else - ngx.header.Content_Security_Policy = csp - end - end - '; - - location ~* ^/ds-vpath/ { - rewrite /ds-vpath/(.*) /$1 break; - - proxy_pass http://172.18.0.4:80; - proxy_redirect off; - - client_max_body_size 100m; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $proxy_connection; - - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host/ds-vpath; - proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; - - } - - location / { - proxy_pass http://127.0.0.1:5001; - location ~* /(manifest.json|sw.js|appIcon(.)*\.png|icon.svg|bg-error.png|favicon.ico|debuginfo.md) { - try_files /$basename /index.html =404; - } - - - location ~* /static/css/ { - try_files /css/$basename /index.html =404; - } - - location ~* /static/fonts/(?[^/]+) { - try_files /fonts/$content/$basename /index.html =404; - } - - location ~* /static/offline/ { - try_files /offline/$basename /index.html =404; - } - - location ~* /thirdparty/ { - try_files /thirdparty/third-party.html /index.html =404; - } - - location ~* /static/locales/(?[^/]+) { - try_files /locales/$content/$basename /index.html =404; - } - - location ~* /static/scripts/ { - try_files /scripts/$basename /index.html =404; - } - - location ~* /static/plugins/ { - try_files /plugins/$basename /index.html =404; - } - - location ~* /static/images/(.*)$ { - try_files /images/$1 /index.html =404; - } - } - - location /doceditor { - proxy_pass http://127.0.0.1:5013; - proxy_redirect off; - - location ~* /static/favicon.ico { - try_files /$basename /index.html =404; - } - - location ~* /static/images/(.*)$ { - try_files /images/$1 /index.html =404; - } - - location ~* /static/css/ { - try_files /css/$basename /index.html =404; - } - - location ~* /static/fonts/(?[^/]+) { - try_files /fonts/$content/$basename /index.html =404; - } - } - - location /login { - proxy_pass http://127.0.0.1:5011; - proxy_redirect off; - - location ~* /static/favicon.ico { - try_files /$basename /index.html =404; - } - - location ~* /static/images/(.*)$ { - try_files /images/$1 /index.html =404; - } - - location ~* /static/css/ { - try_files /css/$basename /index.html =404; - } - - location ~* /static/fonts/(?[^/]+) { - try_files /fonts/$content/$basename /index.html =404; - } - } - - location /sockjs-node { - proxy_pass http://127.0.0.1:5001; - proxy_redirect off; - } - - location /api/2.0 { - location ~* /(files|privacyroom) { - proxy_pass http://127.0.0.1:5007; - } - - location ~* /(people|group) { - proxy_pass http://127.0.0.1:5004; - } - - location ~* /(authentication|modules|portal|security|settings|smtpsettings|capabilities|thirdparty|encryption|feed) { - proxy_pass http://127.0.0.1:5000; - - location ~* portal/(.*)(backup|restore)(.*) { - rewrite (.*)/portal/(.*) $1/backup/$2 break; - proxy_redirect off; - proxy_pass http://127.0.0.1:5012; - } - - location ~* authentication/register(.*) { - rewrite (.*)/authentication/register(.*) $1/people/register$2 break; - proxy_redirect off; - proxy_pass http://127.0.0.1:5004; - } - } - - location ~* /backup { - proxy_pass http://127.0.0.1:5012; - } - - location ~* /plugins { - proxy_pass http://127.0.0.1:5014; - } - - location ~* /migration { - proxy_pass http://127.0.0.1:5034; - } - } - - location /sso { - rewrite sso/(.*) /$1 break; - proxy_pass http://127.0.0.1:9834; - } - location ~* /(ssologin.ashx|login.ashx|storage) { - proxy_pass http://127.0.0.1:5003; - } - - location /socket.io/ { - proxy_pass http://127.0.0.1:9899; - proxy_redirect off; - } - - location /backupFileUpload.ashx { - proxy_pass http://127.0.0.1:5012; - } - - location /logoUploader.ashx { - proxy_pass http://127.0.0.1:5000; - } - - location /payment.ashx { - proxy_pass http://127.0.0.1:5000; - } - - location /ThirdPartyApp { - proxy_pass http://127.0.0.1:5007; - } - - location ~* /filehandler.ashx { - proxy_pass http://127.0.0.1:5007; - } - - location /ChunkedUploader.ashx { - proxy_pass http://127.0.0.1:5007; - } - - location /apisystem { - rewrite apisystem/(.*) /$1 break; - proxy_pass http://127.0.0.1:5010; - } - - location /apicache { - rewrite apicache/(.*) /$1 break; - proxy_pass http://127.0.0.1:5100; - } - - location /sh { - rewrite sh/(.*) /$1 break; - proxy_pass http://127.0.0.1:9999; - } - - location /healthchecks { - rewrite /healthchecks/(.*)$ /$1 break; - proxy_pass http://127.0.0.1:5033; - } -} +map $http_host $this_host { + "" $host; + default $http_host; +} + +map $http_cloudfront_forwarded_proto $cloudfront_forwarded_proto { + default $http_cloudfront_forwarded_proto; + "" $scheme; +} + +map $http_x_forwarded_proto $proxy_x_forwarded_proto { + default $http_x_forwarded_proto; + "" $cloudfront_forwarded_proto; +} + +map $http_x_forwarded_port $proxy_x_forwarded_port { + default $http_x_forwarded_port; + '' $server_port; +} + +map $http_x_forwarded_host $proxy_x_forwarded_host { + default $http_x_forwarded_host; + "" $this_host; +} + +map $scheme $proxy_x_forwarded_ssl { + default off; + https on; +} + +map $http_upgrade $proxy_connection { + default upgrade; + '' close; +} + +map $uri $basename { + ~/(?[^/]*)$ $captured_basename; +} + +map $request_uri $header_x_frame_options { + ~*^/(favicon\.ico|products\/files\/share|products\/files\/saveas|products\/files\/filechoice|products\/files\/doceditor|thirdparty\/plugin) ""; + default "SAMEORIGIN"; +} + +map $request_uri $cache_control { + default "no-cache, no-store, no-transform"; + ~*\/(filehandler\.ashx\?action=(thumb|preview))|\/(storage\/room_logos\/root\/|storage\/userPhotos\/root\/) "must-revalidate, no-transform, immutable, max-age=31536000"; + ~*\/(api\/2\.0.*|storage|login\.ashx|filehandler\.ashx|ChunkedUploader.ashx|ThirdPartyAppHandler|apisystem|sh|remoteEntry\.js|debuginfo\.md|static\/scripts.*) "no-cache, no-store, no-transform"; + ~*\/(images|favicon.ico.*)|\.(js|woff|woff2|css)|(locales.*\.json) "must-revalidate, no-transform, immutable, max-age=31536000"; +} + +include /etc/nginx/includes/onlyoffice-*.conf; + +server_names_hash_bucket_size 128; + +server { + listen 8092; + + add_header Referrer-Policy "same-origin"; + add_header X-Content-Type-Options "nosniff"; + add_header X-Frame-Options $header_x_frame_options; + add_header Cache-Control $cache_control; + root $public_root; + etag on; + + large_client_header_buffers 4 16k; + client_max_body_size 4G; + + gzip on; + gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript; + + fastcgi_read_timeout 600; + fastcgi_send_timeout 600; + fastcgi_keep_conn on; + fastcgi_intercept_errors on; + + include fastcgi_params; + + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO ""; + + proxy_http_version 1.1; + proxy_set_header Host $this_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; + proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl; + proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $proxy_connection; + proxy_set_header Proxy ""; + + set $csp ""; + access_by_lua ' + if ngx.req.get_method() == "GET" then + local key = string.format("csp:%s",ngx.var.host) + local redis = require "resty.redis" + local red = redis:new() + local redis_host = "127.0.0.1" + local redis_port = 6379 + + red:set_timeout(1000) -- 1 second + + local ok, err = red:connect(redis_host, redis_port) + if not ok then + ngx.log(ngx.ERR, "failed to connect to redis: ", err) + end + + local csp, err = red:hget(key, "data") + + if csp == ngx.null then + ngx.log(ngx.ERR, "failed to get redis key: ", err) + else + ngx.header.Content_Security_Policy = csp + end + end + '; + + location ~* ^/ds-vpath/ { + rewrite /ds-vpath/(.*) /$1 break; + + proxy_pass http://172.18.0.4:80; + proxy_redirect off; + + client_max_body_size 100m; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $proxy_connection; + + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $proxy_x_forwarded_host/ds-vpath; + proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; + + } + + location / { + proxy_pass http://127.0.0.1:5001; + location ~* /(manifest.json|sw.js|appIcon(.)*\.png|icon.svg|bg-error.png|favicon.ico|debuginfo.md) { + try_files /$basename /index.html =404; + } + + + location ~* /static/css/ { + try_files /css/$basename /index.html =404; + } + + location ~* /static/fonts/(?[^/]+) { + try_files /fonts/$content/$basename /index.html =404; + } + + location ~* /static/offline/ { + try_files /offline/$basename /index.html =404; + } + + location ~* /thirdparty/ { + try_files /thirdparty/third-party.html /index.html =404; + } + + location ~* /static/locales/(?[^/]+) { + try_files /locales/$content/$basename /index.html =404; + } + + location ~* /static/scripts/ { + try_files /scripts/$basename /index.html =404; + } + + location ~* /static/plugins/ { + try_files /plugins/$basename /index.html =404; + } + + location ~* /static/images/(.*)$ { + try_files /images/$1 /index.html =404; + } + } + + location /doceditor { + proxy_pass http://127.0.0.1:5013; + proxy_redirect off; + + location ~* /static/favicon.ico { + try_files /$basename /index.html =404; + } + + location ~* /static/images/(.*)$ { + try_files /images/$1 /index.html =404; + } + + location ~* /static/css/ { + try_files /css/$basename /index.html =404; + } + + location ~* /static/fonts/(?[^/]+) { + try_files /fonts/$content/$basename /index.html =404; + } + } + + location /login { + proxy_pass http://127.0.0.1:5011; + proxy_redirect off; + + location ~* /static/favicon.ico { + try_files /$basename /index.html =404; + } + + location ~* /static/images/(.*)$ { + try_files /images/$1 /index.html =404; + } + + location ~* /static/css/ { + try_files /css/$basename /index.html =404; + } + + location ~* /static/fonts/(?[^/]+) { + try_files /fonts/$content/$basename /index.html =404; + } + } + + location /sockjs-node { + proxy_pass http://127.0.0.1:5001; + proxy_redirect off; + } + + location /api/2.0 { + location ~* /(files|privacyroom) { + proxy_pass http://127.0.0.1:5007; + } + + location ~* /(people|group) { + proxy_pass http://127.0.0.1:5004; + } + + location ~* /(authentication|modules|portal|security|settings|smtpsettings|capabilities|thirdparty|encryption|feed) { + proxy_pass http://127.0.0.1:5000; + + location ~* portal/(.*)(backup|restore)(.*) { + rewrite (.*)/portal/(.*) $1/backup/$2 break; + proxy_redirect off; + proxy_pass http://127.0.0.1:5012; + } + + location ~* authentication/register(.*) { + rewrite (.*)/authentication/register(.*) $1/people/register$2 break; + proxy_redirect off; + proxy_pass http://127.0.0.1:5004; + } + } + + location ~* /backup { + proxy_pass http://127.0.0.1:5012; + } + + location ~* /plugins { + proxy_pass http://127.0.0.1:5014; + } + + location ~* /migration { + proxy_pass http://127.0.0.1:5034; + } + } + + location /sso { + rewrite sso/(.*) /$1 break; + proxy_pass http://127.0.0.1:9834; + } + location ~* /(ssologin.ashx|login.ashx|storage) { + proxy_pass http://127.0.0.1:5003; + } + + location /socket.io/ { + proxy_pass http://127.0.0.1:9899; + proxy_redirect off; + } + + location /backupFileUpload.ashx { + proxy_pass http://127.0.0.1:5012; + } + + location /logoUploader.ashx { + proxy_pass http://127.0.0.1:5000; + } + + location /payment.ashx { + proxy_pass http://127.0.0.1:5000; + } + + location /ThirdPartyApp { + proxy_pass http://127.0.0.1:5007; + } + + location ~* /filehandler.ashx { + proxy_pass http://127.0.0.1:5007; + } + + location /ChunkedUploader.ashx { + proxy_pass http://127.0.0.1:5007; + } + + location /apisystem { + rewrite apisystem/(.*) /$1 break; + proxy_pass http://127.0.0.1:5010; + } + + location /apicache { + rewrite apicache/(.*) /$1 break; + proxy_pass http://127.0.0.1:5100; + } + + location /sh { + rewrite sh/(.*) /$1 break; + proxy_pass http://127.0.0.1:9999; + } + + location /healthchecks { + rewrite /healthchecks/(.*)$ /$1 break; + proxy_pass http://127.0.0.1:5033; + } +} diff --git a/config/nginx/proxy-frontend-virt.conf b/build/config/nginx/proxy-frontend-virt.conf similarity index 100% rename from config/nginx/proxy-frontend-virt.conf rename to build/config/nginx/proxy-frontend-virt.conf diff --git a/config/nginx/proxy-frontend.conf b/build/config/nginx/proxy-frontend.conf similarity index 100% rename from config/nginx/proxy-frontend.conf rename to build/config/nginx/proxy-frontend.conf diff --git a/config/nginx/sites-enabled/onlyoffice-client.conf b/build/config/nginx/sites-enabled/onlyoffice-client.conf similarity index 100% rename from config/nginx/sites-enabled/onlyoffice-client.conf rename to build/config/nginx/sites-enabled/onlyoffice-client.conf diff --git a/config/nlog.config b/build/config/nlog.config similarity index 98% rename from config/nlog.config rename to build/config/nlog.config index a0d97248b7..a8838cf0ea 100644 --- a/config/nlog.config +++ b/build/config/nlog.config @@ -1,57 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/notify.json b/build/config/notify.json similarity index 95% rename from config/notify.json rename to build/config/notify.json index 8a1da6ee03..de5c99faee 100644 --- a/config/notify.json +++ b/build/config/notify.json @@ -1,26 +1,26 @@ - { - "notify": { - "connectionStringName": "default", - "storeMessagesDays": 7, - "process": { - "maxThreads": 2, - "bufferSize": 10, - "maxAttempts": 10, - "attemptsInterval": "0:5:0" - }, - "senders": [ - { - "name": "messanger.sender", - "type": "ASC.Core.Notify.Senders.JabberSender, ASC.Core.Common" - }, - { - "name": "email.sender", - "type": "ASC.Core.Notify.Senders.SmtpSender, ASC.Core.Common", - "properties" : - { - "useCoreSettings" : "true" - } - } - ] - } + { + "notify": { + "connectionStringName": "default", + "storeMessagesDays": 7, + "process": { + "maxThreads": 2, + "bufferSize": 10, + "maxAttempts": 10, + "attemptsInterval": "0:5:0" + }, + "senders": [ + { + "name": "messanger.sender", + "type": "ASC.Core.Notify.Senders.JabberSender, ASC.Core.Common" + }, + { + "name": "email.sender", + "type": "ASC.Core.Notify.Senders.SmtpSender, ASC.Core.Common", + "properties" : + { + "useCoreSettings" : "true" + } + } + ] + } } \ No newline at end of file diff --git a/config/plugins.json b/build/config/plugins.json similarity index 100% rename from config/plugins.json rename to build/config/plugins.json diff --git a/config/rabbitmq.json b/build/config/rabbitmq.json similarity index 100% rename from config/rabbitmq.json rename to build/config/rabbitmq.json diff --git a/config/rabbitmq.test.json b/build/config/rabbitmq.test.json similarity index 100% rename from config/rabbitmq.test.json rename to build/config/rabbitmq.test.json diff --git a/config/radicale.config b/build/config/radicale.config similarity index 100% rename from config/radicale.config rename to build/config/radicale.config diff --git a/config/radicale.log.config b/build/config/radicale.log.config similarity index 100% rename from config/radicale.log.config rename to build/config/radicale.log.config diff --git a/config/radicale.rights b/build/config/radicale.rights similarity index 100% rename from config/radicale.rights rename to build/config/radicale.rights diff --git a/config/redis.json b/build/config/redis.json similarity index 100% rename from config/redis.json rename to build/config/redis.json diff --git a/config/socket.json b/build/config/socket.json similarity index 100% rename from config/socket.json rename to build/config/socket.json diff --git a/config/socket.test.json b/build/config/socket.test.json similarity index 100% rename from config/socket.test.json rename to build/config/socket.test.json diff --git a/config/ssoauth.json b/build/config/ssoauth.json similarity index 100% rename from config/ssoauth.json rename to build/config/ssoauth.json diff --git a/config/storage.json b/build/config/storage.json similarity index 96% rename from config/storage.json rename to build/config/storage.json index 37073f8160..a3f255081e 100644 --- a/config/storage.json +++ b/build/config/storage.json @@ -1,133 +1,133 @@ -{ - "storage": { - "appender": [ - { - "name": "generic", - "append": "~/" - } - ], - "handler": [ - { - "name": "disc", - "type": "ASC.Data.Storage.DiscStorage.DiscDataStore, ASC.Data.Storage", - "property": [ - { - "name": "$STORAGE_ROOT", - "value": "..\\Data\\" - } - ] - } - ], - "module": [ - { - "name": "files", - "data": "e67be73d-f9ae-4ce1-8fec-1880cb518cb4", - "type": "disc", - "path": "$STORAGE_ROOT\\Products\\Files", - "expires": "0:16:0", - "domain": [ - { - "name": "files_temp", - "visible": false, - "data": "00000000-0000-0000-0000-000000000000", - "path": "$STORAGE_ROOT\\Products\\Files\\{0}\\temp", - "virtualpath": "~/products/community/modules/wiki/data/filestemp", - "expires": "0:10:0" - } - ] - }, - { - "name": "room_logos", - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Products\\Files\\logos\\{0}", - "domain": [ - { - "name": "logos_temp", - "visible": false, - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Products\\Files\\logos\\{0}\\temp" - } - ] - }, - { - "name": "files_template", - "visible": false, - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "DocStore", - "virtualpath": "~/products/files/docstore", - "appendTenantId": false, - "public": true, - "disableMigrate": true, - "disableEncryption": true - }, - { - "name": "certs", - "visible": "false", - "type": "disc", - "path": "$STORAGE_ROOT\\certs\\", - "appendTenantId": false, - "disableEncryption": true - }, - { - "name": "logo", - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\logo", - "virtualpath": "~/studio/{0}/logo", - "public": true - }, - { - "name": "whitelabel", - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\CoBranding", - "virtualpath": "~/studio/{0}/cobranding", - "public": true - }, - { - "name": "backup", - "visible": false, - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\backup", - "virtualpath": "~/studio/{0}/backup", - "expires": "0:10:0", - "disableEncryption": true - }, - { - "name": "backup_temp", - "visible": false, - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\temp\\backup", - "expires": "0:10:0", - "disableEncryption": true - }, - { - "name": "customnavigation", - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\customnavigation", - "virtualpath": "~/studio/{0}/customnavigation" - }, - { - "name": "userPhotos", - "count": false, - "data": "00000000-0000-0000-0000-000000000000", - "type": "disc", - "path": "$STORAGE_ROOT\\Studio\\{0}\\userphotos", - "virtualpath": "~/studio/{0}/userphotos", - "domain": [ - { - "name": "temp", - "visible": false, - "data": "00000000-0000-0000-0000-000000000000", - "path": "$STORAGE_ROOT\\Studio\\{0}\\userphotos\\temp", - "virtualpath": "~/studio/{0}/userphotos/temp" - } - ] - } - ] - } -} +{ + "storage": { + "appender": [ + { + "name": "generic", + "append": "~/" + } + ], + "handler": [ + { + "name": "disc", + "type": "ASC.Data.Storage.DiscStorage.DiscDataStore, ASC.Data.Storage", + "property": [ + { + "name": "$STORAGE_ROOT", + "value": "..\\Data\\" + } + ] + } + ], + "module": [ + { + "name": "files", + "data": "e67be73d-f9ae-4ce1-8fec-1880cb518cb4", + "type": "disc", + "path": "$STORAGE_ROOT\\Products\\Files", + "expires": "0:16:0", + "domain": [ + { + "name": "files_temp", + "visible": false, + "data": "00000000-0000-0000-0000-000000000000", + "path": "$STORAGE_ROOT\\Products\\Files\\{0}\\temp", + "virtualpath": "~/products/community/modules/wiki/data/filestemp", + "expires": "0:10:0" + } + ] + }, + { + "name": "room_logos", + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Products\\Files\\logos\\{0}", + "domain": [ + { + "name": "logos_temp", + "visible": false, + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Products\\Files\\logos\\{0}\\temp" + } + ] + }, + { + "name": "files_template", + "visible": false, + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "DocStore", + "virtualpath": "~/products/files/docstore", + "appendTenantId": false, + "public": true, + "disableMigrate": true, + "disableEncryption": true + }, + { + "name": "certs", + "visible": "false", + "type": "disc", + "path": "$STORAGE_ROOT\\certs\\", + "appendTenantId": false, + "disableEncryption": true + }, + { + "name": "logo", + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\logo", + "virtualpath": "~/studio/{0}/logo", + "public": true + }, + { + "name": "whitelabel", + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\CoBranding", + "virtualpath": "~/studio/{0}/cobranding", + "public": true + }, + { + "name": "backup", + "visible": false, + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\backup", + "virtualpath": "~/studio/{0}/backup", + "expires": "0:10:0", + "disableEncryption": true + }, + { + "name": "backup_temp", + "visible": false, + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\temp\\backup", + "expires": "0:10:0", + "disableEncryption": true + }, + { + "name": "customnavigation", + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\customnavigation", + "virtualpath": "~/studio/{0}/customnavigation" + }, + { + "name": "userPhotos", + "count": false, + "data": "00000000-0000-0000-0000-000000000000", + "type": "disc", + "path": "$STORAGE_ROOT\\Studio\\{0}\\userphotos", + "virtualpath": "~/studio/{0}/userphotos", + "domain": [ + { + "name": "temp", + "visible": false, + "data": "00000000-0000-0000-0000-000000000000", + "path": "$STORAGE_ROOT\\Studio\\{0}\\userphotos\\temp", + "virtualpath": "~/studio/{0}/userphotos/temp" + } + ] + } + ] + } +} diff --git a/config/thumb.json b/build/config/thumb.json similarity index 100% rename from config/thumb.json rename to build/config/thumb.json diff --git a/config/thumb.test.json b/build/config/thumb.test.json similarity index 91% rename from config/thumb.test.json rename to build/config/thumb.test.json index 5e7efa7bd6..38f35a9da2 100644 --- a/config/thumb.test.json +++ b/build/config/thumb.test.json @@ -1,5 +1,5 @@ -{ - "thumb": { - "path": "../client/" - } +{ + "thumb": { + "path": "../client/" + } } \ No newline at end of file diff --git a/config/urlshortener.test.json b/build/config/urlshortener.test.json similarity index 93% rename from config/urlshortener.test.json rename to build/config/urlshortener.test.json index 1523150512..6de1919217 100644 --- a/config/urlshortener.test.json +++ b/build/config/urlshortener.test.json @@ -1,5 +1,5 @@ -{ - "urlshortener": { - "path": "../client/index.js" - } +{ + "urlshortener": { + "path": "../client/index.js" + } } \ No newline at end of file