Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo web #381

Merged
merged 5 commits into from
Dec 17, 2024
Merged

Demo web #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19c0dfb
Adjust protocols and ciphers as per workshop&outreach
pwalczysko Dec 13, 2024
f806daf
Remove unused jinja files for sls-gallery and learning
pwalczysko Dec 13, 2024
02723b4
Introduce nginx_version: 1.26.2 variable in demo playbook
pwalczysko Dec 13, 2024
9005c5f
Bump web and server on demo
pwalczysko Dec 16, 2024
57171f3
Change the target owner of the figure_scripts dir to be omero-server
pwalczysko Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions playbooks/files/learning-omero-web.conf
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions playbooks/files/sls-gallery-omero-web.conf
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions playbooks/ome-demoserver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@
state: directory
mode: 0755
recurse: true
owner: root
owner: "omero-server"
group: "omero-server"

- name: Download the Figure_To_Pdf.py script
become: true
Expand All @@ -209,6 +210,7 @@
force: true

vars:
nginx_version: 1.26.2
omero_figure_release: >-
{{ omero_figure_release_override | default('7.2.0') }}
omero_figure_script_release: >-
Expand All @@ -227,8 +229,8 @@
{{ omero_signup_release_override | default('0.3.3') }}

omero_server_release: >-
{{ omero_server_release_override | default('5.6.13') }}
omero_web_release: "{{ omero_web_release_override | default('5.27.2') }}"
{{ omero_server_release_override | default('5.6.14') }}
omero_web_release: "{{ omero_web_release_override | default('5.28.0') }}"
omero_py_release: "{{ omero_py_release_override | default('5.19.5') }}"
# For https://github.com/openmicroscopy/ansible-role-java,
# which is a dependency.
Expand Down
4 changes: 4 additions & 0 deletions playbooks/templates/nginx-confdnestedincludes-ssl-conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ ssl_certificate_key {{ ssl_certificate_key_path }};
# http://nginx.org/en/docs/http/configuring_https_servers.html
ssl_prefer_server_ciphers on;

ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;


# HTTP Strict Transport Security (HSTS)
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;

Expand Down