Skip to content

Commit

Permalink
fixup diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
hexylena committed Dec 18, 2024
1 parent cf9f4d8 commit 4bda200
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion topics/admin/tutorials/beacon/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Now that our beacon is running, we need to get data from Galaxy to the Beacon
> ```diff
> --- a/templates/nginx/galaxy.j2
> +++ b/templates/nginx/galaxy.j2
> @@ -115,4 +115,14 @@ server {
> @@ -117,4 +117,14 @@ server {
>
> {{ tiaas_nginx_routes }}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ be taken into consideration when choosing where to run jobs and what parameters
> @@ -194,6 +194,16 @@ nginx_ssl_role: usegalaxy_eu.certbot
> nginx_conf_ssl_certificate: /etc/ssl/certs/fullchain.pem
> nginx_conf_ssl_certificate_key: /etc/ssl/user/privkey-www-data.pem
>
>
> +# Slurm
> +slurm_roles: ['controller', 'exec'] # Which roles should the machine play? exec are execution hosts.
> +slurm_nodes:
Expand Down
8 changes: 4 additions & 4 deletions topics/admin/tutorials/monitoring/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -535,15 +535,15 @@ There are some nice examples of dashboards available from the public Galaxies, w
> ```diff
> --- a/templates/nginx/galaxy.j2
> +++ b/templates/nginx/galaxy.j2
> @@ -108,4 +108,9 @@ server {
> proxy_pass http://{{ galaxy_config.gravity.reports.bind }}:/;
> @@ -109,4 +109,9 @@ server {
> proxy_set_header X-Forwarded-Host $host;
> proxy_set_header X-Forwarded-Proto $scheme;
> }
>
> +
> + location /grafana/ {
> + proxy_pass http://127.0.0.1:3000/;
> + proxy_set_header Host $http_host;
> + }
> +
> }
> {% endraw %}
> ```
Expand Down
7 changes: 3 additions & 4 deletions topics/admin/tutorials/reports/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,16 @@ The reports application is included with the Galaxy codebase and this tutorial a
> ```diff
> --- a/templates/nginx/galaxy.j2
> +++ b/templates/nginx/galaxy.j2
> @@ -103,4 +103,9 @@ server {
> @@ -103,4 +103,10 @@ server {
> proxy_set_header Upgrade $http_upgrade;
> proxy_set_header Connection "upgrade";
> }
> +
> + location /reports/ {
> + proxy_pass http://{{ galaxy_config.gravity.reports.bind }}:/;
> + proxy_set_header X-Forwarded-Host $host;
> + proxy_set_header X-Forwarded-Proto $scheme;
> + proxy_set_header X-Forwarded-Host $host;
> + proxy_set_header X-Forwarded-Proto $scheme;
> + }
> +
> }
> {% endraw %}
> ```
Expand Down
5 changes: 3 additions & 2 deletions topics/admin/tutorials/tiaas/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,11 @@ This tutorial will go cover how to set up such a service on your own Galaxy serv
> ```diff
> --- a/templates/nginx/galaxy.j2
> +++ b/templates/nginx/galaxy.j2
> @@ -113,4 +113,6 @@ server {
> @@ -114,4 +114,7 @@ server {
> proxy_pass http://127.0.0.1:3000/;
> proxy_set_header Host $http_host;
> }
>
> +
> + {{ tiaas_nginx_routes }}
> +
> }
Expand Down

0 comments on commit 4bda200

Please sign in to comment.