Merge pull request #2123 from jburel/certificates

Use omero-certificates
ome · May 12, 2020 · 61f0adf · 61f0adf
2 parents 0f5ab3f + 2ec6207
commit 61f0adf
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 46 deletions.
diff --git a/omero/sysadmins/unix/server-centos7-ice36.rst b/omero/sysadmins/unix/server-centos7-ice36.rst
@@ -78,7 +78,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_centos7.sh
     :start-after: #start-step03bis
@@ -102,6 +102,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -111,7 +114,7 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_centos7.sh
     :start-after: #end-copy-omeroscript

diff --git a/omero/sysadmins/unix/server-centos8-ice36.rst b/omero/sysadmins/unix/server-centos8-ice36.rst
@@ -78,7 +78,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_centos8.sh
     :start-after: #start-step03bis
@@ -102,6 +102,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -111,22 +114,18 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_centos8.sh
     :start-after: #end-copy-omeroscript
     :end-before: #end-step04
 
-Patching OMERO.server
----------------------
 
-Weaker ciphers like ADH are disabled by default in OpenSSL 1.1.0,
-the version installed on Debian 10.
+Weaker ciphers like ADH are disabled by default in OpenSSL 1.1+,
+the version installed on CentOS 8.
 This means that it is not possible to connect to an OMERO.server
 using any OMERO clients e.g. the Java Desktop client,
 the OMERO.web client or the CLI.
-The parameter ``@SECLEVEL=0``, enabling the weaker ciphers, needs to be
-set in order to allow connection.
 
 .. literalinclude:: walkthrough/walkthrough_centos8.sh
     :start-after: #start-seclevel

diff --git a/omero/sysadmins/unix/server-debian10-ice36.rst b/omero/sysadmins/unix/server-debian10-ice36.rst
@@ -79,7 +79,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_debian10.sh
     :start-after: #start-step03bis
@@ -103,6 +103,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.**
 
 The variable :envvar:`OMERODIR` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -112,22 +115,17 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_debian10.sh
     :start-after: #end-copy-omeroscript
     :end-before: #end-step04
 
-Patching OMERO.server
----------------------
-
-Weaker ciphers like ADH are disabled by default in OpenSSL 1.1.0,
+Weaker ciphers like ADH are disabled by default in OpenSSL 1.1+,
 the version installed on Debian 10.
 This means that it is not possible to connect to an OMERO.server
 using any OMERO clients e.g. the Java Desktop client,
-the OMERO.web client or the CLI.
-The parameter ``@SECLEVEL=0``, enabling the weaker ciphers, needs to be
-set in order to allow connection.
+the OMERO.web client or the CLI. Run:
 
 .. literalinclude:: walkthrough/walkthrough_debian10.sh
     :start-after: #start-seclevel

diff --git a/omero/sysadmins/unix/server-debian9-ice36.rst b/omero/sysadmins/unix/server-debian9-ice36.rst
@@ -92,7 +92,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_debian9.sh
     :start-after: #start-step03bis
@@ -116,6 +116,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -125,22 +128,17 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_debian9.sh
     :start-after: #end-copy-omeroscript
     :end-before: #end-step04
 
-Patching OMERO.server
----------------------
-
 Weaker ciphers like ADH are disabled by default in OpenSSL 1.1.0,
 the version installed on Debian 9.
 This means that it is not possible to connect to an OMERO.server
 using any OMERO clients e.g. the Java Desktop client,
-the OMERO.web client or the CLI.
-The parameter ``@SECLEVEL=0``, enabling the weaker ciphers, needs to be
-set in order to allow connection.
+the OMERO.web client or the CLI. Run:
 
 .. literalinclude:: walkthrough/walkthrough_debian9.sh
     :start-after: #start-seclevel

diff --git a/omero/sysadmins/unix/server-ubuntu1604-ice36.rst b/omero/sysadmins/unix/server-ubuntu1604-ice36.rst
@@ -78,7 +78,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu1604.sh
     :start-after: #start-step03bis
@@ -102,6 +102,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -111,7 +114,7 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu1604.sh
     :start-after: #end-copy-omeroscript

diff --git a/omero/sysadmins/unix/server-ubuntu1804-ice36.rst b/omero/sysadmins/unix/server-ubuntu1804-ice36.rst
@@ -84,7 +84,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu1804.sh
     :start-after: #start-step03bis
@@ -108,6 +108,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -117,22 +120,17 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu1804.sh
     :start-after: #end-copy-omeroscript
     :end-before: #end-step04
 
-Patching OMERO.server
----------------------
-
-Weaker ciphers like ADH are disabled by default in OpenSSL 1.1.0,
+Weaker ciphers like ADH are disabled by default in OpenSSL 1.1+,
 the version installed on Ubuntu 18.04.
 This means that it is not possible to connect to an OMERO.server
 using any OMERO clients e.g. the Java Desktop client,
-the OMERO.web client or the CLI.
-The parameter ``@SECLEVEL=0``, enabling the weaker ciphers, needs to be
-set in order to allow connection.
+the OMERO.web client or the CLI. Run:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu1804.sh
     :start-after: #start-seclevel

diff --git a/omero/sysadmins/unix/server-ubuntu2004-ice36.rst b/omero/sysadmins/unix/server-ubuntu2004-ice36.rst
@@ -84,7 +84,7 @@ Installing OMERO.server
 
 **The following step is run as root.**
 
-We recommend to create a virtual environment and install the Ice Python binding and PyTables_ using ``pip``:
+We recommend to create a virtual environment and install the Ice Python binding and the dependencies required by the server using ``pip``:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu2004.sh
     :start-after: #start-step03bis
@@ -108,6 +108,9 @@ Change the ownership of the OMERO.server directory and create a symlink:
     :start-after: #end-release-ice36
     :end-before: #end-step04-pre
 
+Configuring OMERO.server
+------------------------
+
 **The following steps are run as the omero-server system user.** (``su - omero-server``)
 
 The variable ``OMERODIR`` set in :download:`settings.env <walkthrough/settings.env>` above **must** point to the location where OMERO.server is installed.
@@ -117,22 +120,18 @@ Note that this script requires the same environment variables that were set
 earlier in `settings.env`, so you may need to copy and/or source this file as
 the omero user.
 
-Configure the server:
+Configure the database and the location of the data directory:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu2004.sh
     :start-after: #end-copy-omeroscript
     :end-before: #end-step04
 
-Patching OMERO.server
----------------------
-
-Weaker ciphers like ADH are disabled by default in OpenSSL 1.1.0,
+Weaker ciphers like ADH are disabled by default in OpenSSL 1.1+,
 the version installed on Ubuntu 20.04.
 This means that it is not possible to connect to an OMERO.server
 using any OMERO clients e.g. the Java Desktop client,
 the OMERO.web client or the CLI.
-The parameter ``@SECLEVEL=0``, enabling the weaker ciphers, needs to be
-set in order to allow connection.
+Run:
 
 .. literalinclude:: walkthrough/walkthrough_ubuntu2004.sh
     :start-after: #start-seclevel