Merge pull request #2207 from jburel/debian9

remove debian9
ome · Jan 11, 2022 · 4547e10 · 4547e10
2 parents 345eab4 + 7b732df
commit 4547e10
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 751 deletions.
diff --git a/omero/autogen_docs b/omero/autogen_docs
@@ -50,7 +50,6 @@ echo "Generating omeroweb install walkthrough"
 
 (cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/centos7-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/centos8-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
-(cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/debian9-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu1804-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu2004-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
 (cd $WORKSPACE/omeroweb-install && ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/debian10-ice3.6 --extra-vars '{"clean": True, "web_session": True}')

diff --git a/omero/conf.py b/omero/conf.py
@@ -223,6 +223,8 @@ def copy_legacy_redirects(app, exception):
     """
     print("Adding redirects:")
     redirect_files = [
+        'sysadmins/unix/install-web/walkthrough/omeroweb-install-debian9-ice3.6.html',
+        'sysadmins/unix/server-debian9-ice36.html',
         'sysadmins/server-overview.html',
         'sysadmins/server-tables.html',
         'sysadmins/omero-home-prefix.html',

diff --git a/omero/sysadmins/troubleshooting.rst b/omero/sysadmins/troubleshooting.rst
@@ -162,7 +162,7 @@ employ the `omero-certificates
 <https://pypi.org/project/omero-certificates/>`_ plugin available from
 PyPI_:
 
-.. literalinclude:: unix/walkthrough/walkthrough_debian9.sh
+.. literalinclude:: unix/walkthrough/walkthrough_debian10.sh
     :start-after: #start-seclevel
     :end-before: #end-seclevel
 

diff --git a/omero/sysadmins/unix/install-web/walkthrough/omeroweb-install-debian9-ice3.6.html b/omero/sysadmins/unix/install-web/walkthrough/omeroweb-install-debian9-ice3.6.html
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <meta http-equiv="refresh" content="1; url=../" />
+    <script>
+      window.location.href = "omeroweb-install-debian10-ice3.6.html"
+    </script>
+  </head>
+</html>