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

This commit is contained in:
Svetlana Maleeva 2024-07-18 12:56:39 +03:00
commit f1b2509d6d

View File

@ -25,7 +25,7 @@
<h2 id="CreateCertificate">Creating and installing CA-signed certificate</h2>
<div class="block_of_step">
<div class="screen_text">
<p>To create the letsencrypt certificate, run the installation script with the following parameters:</p>
<p>If you want to install Docspace with SSL right away using the letsencrypt certificate, run the installation script with the following parameters:</p>
<pre><code>bash <%= ((BasePage)Page).CommandName %>-install.sh docker --letsencryptmail user@example.com --letsencryptdomain yourdomain.com</code></pre>
<p>Where:</p>
<ul>
@ -33,7 +33,7 @@
<li><code>letsencryptdomain</code> is the address of the domain where your <b><%= ((BasePage)Page).EditionVersion %></b> portal is installed.</li>
</ul>
<p>The script will automatically create and install the <a target="_blank" href="https://letsencrypt.org/">letsencrypt.org</a> CA-signed certificate to your server and restart the NGINX service for the changes to take effect.</p>
<p>Alternatively, you can launch switching to HTTPS manually from the <code>/app/onlyoffice/config/docspace-ssl-setup</code> file:</p>
<p>If you want to switch to HTTPS already installed DocSpace, you can launch switching to HTTPS manually from the <code>/app/onlyoffice/config/docspace-ssl-setup</code> file:</p>
<pre><code>bash /app/onlyoffice/config/docspace-ssl-setup user@example.com yourdomain.com</code></pre>
<p>Now your portal should be available via the <span class="param-type">https://</span> address.</p>
</div>
@ -42,14 +42,14 @@
<h2 id="OwnCertificate">Using own certificates</h2>
<div class="block_of_step">
<div class="screen_text">
<p>To use your own certificates, run the installation script with the following parameters:</p>
<p>If you want to install Docspace with SSL right away using your own certificates, run the installation script with the following parameters:</p>
<pre><code>bash <%= ((BasePage)Page).CommandName %>-install.sh docker --certfile path --certkeyfile path</code></pre>
<p>Where:</p>
<ul>
<li><code>certfile</code> is the path to the certificate file for the domain.</li>
<li><code>certkeyfile</code> is the path to the private key file for the certificate.</li>
</ul>
<p>Alternatively, you can launch switching to HTTPS manually from the <code>/app/onlyoffice/config/docspace-ssl-setup</code> file:</p>
<p>If you want to switch to HTTPS already installed DocSpace, you can launch switching to HTTPS manually from the <code>/app/onlyoffice/config/docspace-ssl-setup</code> file:</p>
<pre><code>bash /app/onlyoffice/config/docspace-ssl-setup -f yourdomain.com /app/onlyoffice/fullchain.pem /app/onlyoffice/privkey.pem</code></pre>
<p>Now your portal should be available via the <span class="param-type">https://</span> address.</p>
</div>