IlyaSobolev/helpcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

Merge branch 'feature/databases' into feature/test-fixes-december-23

Browse Source
This commit is contained in:
Svetlana Maleeva 2024-03-19 18:08:34 +03:00
commit 3031f7ce43
16 changed files with 120 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Web/App_GlobalResources/Resource.resx
View File

@ -5218,10 +5218,4 @@
<data name="ConnectDamengTitle" xml:space="preserve">
<value>Connecting Dameng database to ONLYOFFICE Docs</value>
</data>
<data name="ConnectOracleTitle" xml:space="preserve">
<value>Connecting Oracle database to ONLYOFFICE Docs</value>
</data>
<data name="ConnectMsSQLTitle" xml:space="preserve">
<value>Connecting MsSQL database to ONLYOFFICE Docs</value>
</data>
</root>

3
Web/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx
View File

@ -1,3 +0,0 @@
<%@ Control Language="C#" %>
<a class="crm-task-title sm_tipstricks sm_saas sm_documents" id="link_182" title="<asp:Literal runat="server" Text="<%$ Resources:Resource, ConnectOracleTitle %>" />"
href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-oracle.aspx")%>"><asp:Literal runat="server" Text="<%$ Resources:Resource, ConnectOracleTitle %>" /></a>

3
Web/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx
View File

@ -1,3 +0,0 @@
<%@ Control Language="C#" %>
<a class="crm-task-title sm_tipstricks sm_saas sm_documents" id="link_183" title="<asp:Literal runat="server" Text="<%$ Resources:Resource, ConnectMsSQLTitle %>" />"
href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-mssql.aspx")%>"><asp:Literal runat="server" Text="<%$ Resources:Resource, ConnectMsSQLTitle %>" /></a>

10
Web/Controls/Help/Installation/Docs.ascx
View File

@ -50,8 +50,8 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/182_connect_oracle.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/183_connect_mssql.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-community-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-community-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>System requirements</h6>
@ -171,6 +171,9 @@
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-enterprise-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-enterprise-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>System requirements</h6>
@ -280,6 +283,9 @@
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-developer-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-developer-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>Developing</h6>

3
Web/Controls/Help/Installation/DocsCommunity.ascx
View File

@ -47,6 +47,9 @@
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-community-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-community-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>System requirements</h6>

3
Web/Controls/Help/Installation/DocsDeveloper.ascx
View File

@ -40,6 +40,9 @@
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-developer-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-developer-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>Developing</h6>

3
Web/Controls/Help/Installation/DocsEnterprise.ascx
View File

@ -39,6 +39,9 @@
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-connect-amazon.aspx")%>">Connecting Amazon S3 bucket as a cache to ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/205_configure_jwt.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-configure-ipfilter.aspx")%>">Configuring IP filter for ONLYOFFICE Docs</a></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/TipsTricks/181_connect_dameng.ascx" /></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-enterprise-connect-oracle.aspx")%>">Connecting Oracle database to ONLYOFFICE Docs</a></li>
<li><a href="<%=VirtualPathUtility.ToAbsolute("~/installation/docs-enterprise-connect-mssql.aspx")%>">Connecting MsSQL database to ONLYOFFICE Docs</a></li>
</ul>
</li>
<li><h6>System requirements</h6>

13
Web/Controls/Help/Server/Document/DocsConnectDameng/DocsConnectDameng.ascx
View File

@ -21,7 +21,7 @@
</div>
<div class="notehelp">The current guide suggests that a test bench has already been implemented in a separate feature/damengdb-compose branch: https://github.com/ONLYOFFICE/Docker-DocumentServer/tree/feature/damengdb-compose/tests/damengdb</div>
<h2>Connecting to Dameng server</h2>
<p>The Document Server has several variables, <b><em>DB_TYPE DB_HOST DB_USER DB_PASSWORD DB_PORT</em></b>, that allow you to customize your database connection. However, currently only MYSQL/MariaDB and PostgreSQL are supported officially.</p>
<p>The Document Server has several variables, <b><em>DB_TYPE</em></b>, <b><em>DB_HOST</em></b>, <b><em>DB_USER</em></b>, <b><em>DB_NAME</em></b>, <b><em>DB_PORT</em></b>, that allow you to customize your database connection. However, currently only MYSQL/MariaDB and PostgreSQL are supported officially.</p>
<p>To connect DamengDb, modify the entry point script and add connection conditions and parameters to the initialization entry point script of the Document Server image:</p>
<ol>
<li>
@ -39,17 +39,18 @@
<li><b>DB_TYPE</b>: damengdb</li>
<li><b>DB_HOST</b>: Name (dns name) of the database service in compose file</li>
<li><b>DB_USER</b>: Username</li>
<li><b>DB_PASS</b>: User password</li>
<li><b>DB_NAME</b></li>
<li><b>DB_PORT</b>: Service port with database</li>
</ul>
<p>Mount the binary directory from the damengdb container so that the document server container has access to the <b>disql</b> utility. Please refer to the <a href="https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/feature/damengdb-compose/tests/damengdb/docker-compose.yml#L34" target="_blank">docker-compose.yml</a> to learn more.</p>
<p>Mount the binary directory from the damengdb container so that the document server container has access to the <b>disql</b> utility. Please refer to the <a href="https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/feature/damengdb-compose/tests/damengdb/docker-compose.yml#L33" target="_blank">docker-compose.yml</a> to learn more.</p>
<h2>Running a stand</h2>
<p>To start the stand, execute the following commands:</p>
<ol>
<li><pre><code>git clone -b feature/damentdb-compose https://github.com/ONLYOFFICE/Docker-DocumentServer.git</code></pre></li>
<li><pre><code>git clone --single-branch --branch feature/damengdb-compose https://github.com/ONLYOFFICE/Docker-DocumentServer.git</code></pre></li>
<li><pre><code>cd Docker-DocumentServer/tests/damengdb/</code></pre></li>
<li><pre><code>docker compose up –d</code></pre></li>
<li><pre><code>docker compose build</code></pre></li>
<li><pre><code>docker compose up -d</code></pre></li>
</ol>
<div class="notehelp">The database image must be available on hub.docker. We have uploaded the image v8.1.2.128 for your convenience: https://hub.docker.com/r/danilaworker/damengdb</div>
<div class="notehelp">The database image must be available on hub.docker. We have uploaded the image v8.1.2.128 for your convenience: https://hub.docker.com/r/onlyoffice/damengdb</div>
</div>
</div>

6
Web/Controls/Help/Server/Document/DocsConnectMsSQL/DocsConnectMsSQL.ascx
View File

@ -23,8 +23,8 @@
<ol>
<li>
Install ONLYOFFICE Docs:
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
onlyoffice/documentserver-ee</code></pre>
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
<span class="community_display">onlyoffice/documentserver</span><span class="enterprise_display">onlyoffice/documentserver-ee</span><span class="developer_display">onlyoffice/documentserver-de</span></code></pre>
</li>
<li>
Install MsSQL on the same or a separate server:
@ -53,7 +53,7 @@ nano /etc/onlyoffice/documentserver/local.json
"CoAuthoring": {
"sql": {
"type": "mssql",
"dbHost": "<mssql_ip_or_hostname>",
"dbHost": "mssql_ip_or_hostname",
"dbPort": "8080",
"dbName": "onlyoffice",
"dbUser": "sa",

5
Web/Controls/Help/Server/Document/DocsConnectOracle/DocsConnectOracle.ascx
View File

@ -24,7 +24,7 @@
<li>
Install ONLYOFFICE Docs:
<pre><code>sudo docker run -i -t -d -p 80:80 --name onlyoffice \
onlyoffice/documentserver-ee</code></pre>
<span class="community_display">onlyoffice/documentserver</span><span class="enterprise_display">onlyoffice/documentserver-ee</span><span class="developer_display">onlyoffice/documentserver-de</span></code></pre>
</li>
<li>
Install Oracle on the same or a separate server:
@ -50,12 +50,13 @@ nano /etc/onlyoffice/documentserver/local.json
"CoAuthoring": {
"sql": {
"type": "oracle",
"dbHost": "<oracle_ip_or_hostname>",
"dbHost": "oracle_ip_or_hostname",
"dbPort": "8080",
"dbName": "xepdb1",
"dbUser": "onlyoffice",
"dbPass": "onlyoffice"
...
supervisorctl restart all
</code></pre>
</li>
</ol>

2
Web/installation/docs-connect-mssql.aspx → Web/installation/docs-community-connect-mssql.aspx
View File

@ -1,7 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="common_all_os document_server installation_docs">
<body class="docs_community_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />

2
Web/installation/docs-connect-oracle.aspx → Web/installation/docs-community-connect-oracle.aspx
View File

@ -1,7 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="common_all_os document_server installation_docs">
<body class="docs_community_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />

22
Web/installation/docs-developer-connect-mssql.aspx Normal file
View File

@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="developer_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Document/DocsConnectMsSQL/DocsConnectMsSQL.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage document">
<div id="SeeAlsoBlockLinks">
<div class="caption guides one">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/166_owncloud.ascx" />
</div>
<div class="caption video one">
<cc:localizecontent runat="Server" controlname="~/Controls/Help/ArticlesCompleteList/Video/150_integrate_owncloud.ascx" />
</div>
</div>
</asp:Content>

22
Web/installation/docs-developer-connect-oracle.aspx Normal file
View File

@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="developer_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Document/DocsConnectOracle/DocsConnectOracle.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage document">
<div id="SeeAlsoBlockLinks">
<div class="caption guides one">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/166_owncloud.ascx" />
</div>
<div class="caption video one">
<cc:localizecontent runat="Server" controlname="~/Controls/Help/ArticlesCompleteList/Video/150_integrate_owncloud.ascx" />
</div>
</div>
</asp:Content>

22
Web/installation/docs-enterprise-connect-mssql.aspx Normal file
View File

@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="docs_enterprise_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Document/DocsConnectMsSQL/DocsConnectMsSQL.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage document">
<div id="SeeAlsoBlockLinks">
<div class="caption guides one">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/166_owncloud.ascx" />
</div>
<div class="caption video one">
<cc:localizecontent runat="Server" controlname="~/Controls/Help/ArticlesCompleteList/Video/150_integrate_owncloud.ascx" />
</div>
</div>
</asp:Content>

22
Web/installation/docs-enterprise-connect-oracle.aspx Normal file
View File

@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/InstallationGuides/InstallationDocsEEArticles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<asp:Content ID="Content4" ContentPlaceHolderID="pagebodyidpage" runat="Server">
<body class="docs_enterprise_edition">
</asp:Content>
<asp:Content ID="content3" ContentPlaceHolderID="breadstop" runat="server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/TopControls/DocumentServerTop/DocumentServerTop.ascx" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Server/Document/DocsConnectOracle/DocsConnectOracle.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage document">
<div id="SeeAlsoBlockLinks">
<div class="caption guides one">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/GettingStarted/166_owncloud.ascx" />
</div>
<div class="caption video one">
<cc:localizecontent runat="Server" controlname="~/Controls/Help/ArticlesCompleteList/Video/150_integrate_owncloud.ascx" />
</div>
</div>
</asp:Content>