Implement custom 502 page (#32)

UtrechtUniversity · Dec 16, 2024 · d0d88bb · d0d88bb
1 parent 6a93afe
commit d0d88bb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 0 deletions.
diff --git a/files/nginx/error502.html b/files/nginx/error502.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Galaxy on ResearchCloud</title>
+    <meta http-equiv="refresh" content="10">
+</head>
+
+<body>
+    <h2>Welcome To Galaxy on ResearchCloud</h2>
+    <p>It looks like Galaxy is not running. Most probably this means Galaxy is still starting up. Please wait!</p>
+    <p>If Galaxy is still not running after ~5 minutes, please contact your sysadmin for support.</p>
+    <p>This page will refresh every 10 seconds.</p>
+</body>
+
+</html>
diff --git a/galaxysrv.yml b/galaxysrv.yml
@@ -24,6 +24,9 @@
           - 'gnutls-bin' # workaround for git-clone issue, https://stackoverflow.com/a/53147659/4326632
         state: present
 
+    - name: Additional nginx config
+      ansible.builtin.include_tasks: tasks/nginx.yml
+
   roles:
     - role: geerlingguy.docker
       when: not _molecule_active and _galaxy_enable_docker

diff --git a/tasks/nginx.yml b/tasks/nginx.yml
@@ -0,0 +1,9 @@
+---
+
+- name: Add custom 502 page
+  ansible.builtin.copy:
+    src: nginx/error502.html
+    dest: "{{ _galaxy_error_502 }}"
+    owner: www-data
+    group: www-data
+    mode: "0740"
diff --git a/vars/internal_vars.yml b/vars/internal_vars.yml
@@ -17,6 +17,7 @@ _galaxy_custom_repo_workflow_location: 'workflows'
 _galaxy_root: /srv/galaxy
 
 _galaxy_local_address: localhost:8080
+_galaxy_error_502: /var/www/galaxy500.html
 
 galaxy_src_documentation: https://github.com/UtrechtUniversity/vre-docs
 

diff --git a/vars/nginx_vars.yml b/vars/nginx_vars.yml
@@ -1,6 +1,7 @@
 galaxy_nginx_vhost_config:
   - name: galaxy
     location: /
+    error_page: 502 /err_502.html
     proxy_pass: "http://{{ _galaxy_local_address }}"
     auth: "{{ _molecule_active | ternary(omit, 'sram') }}"
     proxy_set_header:
@@ -27,3 +28,7 @@ galaxy_nginx_vhost_config:
     proxy_redirect: 'off'
     proxy_http_version: '1.1'
     proxy_pass: "http://localhost:{{ gie_proxy_port }}"
+  - name: custom_errpage
+    location: = /err_502.html
+    root: "{{ _galaxy_error_502 }}"
+    internal: ''