Skip to content

Commit

Permalink
merge develop -Dorg -Ssuccess-only: PR 2442 (Debian10)
Browse files Browse the repository at this point in the history
  • Loading branch information
snoopycrimecop committed Jul 12, 2024
2 parents 69806f8 + e5e98b6 commit 63eda18
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 613 deletions.
1 change: 0 additions & 1 deletion omero/autogen_omeroweb_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ $DOCVENV/bin/pip install 'ansible<2.10' jinja2==3.0.1
(cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/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 && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/ubuntu2204-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
(cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/rockylinux9-ice3.6 --extra-vars '{"clean": True, "web_session": True}')
(cd $WORKSPACE/omeroweb-install && $DOCVENV/bin/ansible-playbook ./.travis/../ansible/omeroweb-install-doc.yml -i ./.travis/../ansible/hosts/debian10-ice3.6 --extra-vars '{"clean": True, "web_session": True}')

mv $WORKSPACE/omeroweb-install/ansible/doc/* omero/sysadmins/unix/install-web/walkthrough/
2 changes: 2 additions & 0 deletions omero/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ def copy_legacy_redirects(app, exception):
'sysadmins/unix/server-ubuntu1804-ice36.html',
'sysadmins/unix/install-web/walkthrough/omeroweb-install-debian9-ice3.6.html',
'sysadmins/unix/server-debian9-ice36.html',
'sysadmins/unix/install-web/walkthrough/omeroweb-install-debian10-ice3.6.html',
'sysadmins/unix/server-debian10-ice36.html',
'sysadmins/unix/install-web/walkthrough/omeroweb-install-centos7-ice3.6.html',
'sysadmins/unix/install-web/walkthrough/omeroweb-install-centos8-ice3.6.html',
'sysadmins/unix/server-centos7-ice36.html',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>
<meta http-equiv="refresh" content="1; url=../" />
<script>
window.location.href = "../web-deployment.html"
</script>
</head>
</html>
Loading

0 comments on commit 63eda18

Please sign in to comment.