Skip to content

Commit f42e4c6

Browse files
committed
feat(conf): support Slurm-web in HTTP subfolder
Support serving Slurm-web gateway in HTTP server subfolder.
1 parent 77c83fd commit f42e4c6

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to
1313
- Add pkgs.rackslab.io packages repositories by default.
1414
- Support GPU gres without model in Slurm configuration.
1515
- Add SSL/TLS certificate for Slurm-web with internal CA.
16+
- Support serving Slurm-web gateway in HTTP server subfolder.
1617
- cli: Add `deploy --update-os-image` option to force download of base OS image
1718
when already present on host.
1819
- lib: Add `deploy --update-os-image` option in bash-completion.

conf/group_vars/all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ slurmweb_agent_settings_defaults:
7575
password: "{{ lookup('ansible.builtin.file', redis_local_password_file) }}"
7676
slurmweb_gateway_settings_defaults:
7777
ui:
78-
host: "https://{{ slurmweb_hostname }}.{{ fhpc_namespace }}"
78+
host: "https://{{ slurmweb_hostname }}.{{ fhpc_namespace }}/{{ slurmweb_gateway_subdir }}"
7979
agents:
8080
url: "https://{{ slurmweb_hostname }}/{{ slurmweb_agent_subdir }}"
8181
authentication:

conf/roles/slurmweb/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ slurmweb_slurmrestd_jwt_mode: auto
1111
slurmweb_slurmrestd_jwt_key: /var/lib/slurm-web/slurmrestd_jwt_hs256.key
1212
slurmweb_slurmrestd_jwt_token: null
1313
slurmweb_local_slurmrestd_jwt_key_file: jwt_hs256.key # dummy
14+
slurmweb_gateway_subdir: ""
1415
slurmweb_agent_subdir: agent
1516
slurmweb_agent_service_override_path: /etc/systemd/system/slurm-web-agent-uwsgi.service.d/firehpc.conf
1617
slurmweb_agent_settings_defaults: {}

conf/roles/slurmweb/templates/nginx.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ server {
1717
ssl_certificate {{ slurmweb_tls_cert_file }};
1818
ssl_certificate_key {{ slurmweb_tls_key_file }};
1919

20-
location / {
20+
location /{{ slurmweb_gateway_subdir }} {
2121
include uwsgi_params;
2222
uwsgi_pass unix:/run/slurm-web-gateway/uwsgi.sock;
2323
}

0 commit comments

Comments
 (0)