From 5da47eadc06f2429da900d3b9f5b419939aa6ba3 Mon Sep 17 00:00:00 2001
From: Arthur Le Bars <arthur.le-bars@sb-roscoff.fr>
Date: Mon, 22 Mar 2021 15:49:50 +0100
Subject: [PATCH] correct rules in services
---
templates/gspecies_compose_template.yml.j2 | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/templates/gspecies_compose_template.yml.j2 b/templates/gspecies_compose_template.yml.j2
index 765886b..6b94c80 100644
--- a/templates/gspecies_compose_template.yml.j2
+++ b/templates/gspecies_compose_template.yml.j2
@@ -83,13 +83,13 @@ services:
- {{ genus_species }}
deploy:
labels:
- - "traefik.http.routers.{{ genus_species }}-galaxy.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/galaxy`))"
+ - "traefik.http.routers.{{ genus_species }}-tripal.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}`))"
{% if https_port is defined %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.tls=true"
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs"
+ - "traefik.http.routers.{{ genus_species }}-tripal.tls=true"
+ - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=webs"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
{% else %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web"
+ - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=web"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix" # lg
{% endif %}
- "traefik.http.services.{{ genus_species }}-tripal.loadbalancer.server.port=80"
@@ -205,13 +205,13 @@ services:
- {{ genus_species }}
deploy:
labels:
- - "traefik.http.routers.{{ genus_species }}-galaxy.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/galaxy`))"
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/jbrowse`))"
{% if https_port is defined %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.tls=true"
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs"
- - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.tls=true"
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=webs"
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
{% else %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web"
+ - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=web"
- "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-app-trailslash,sp-app-prefix" #lg
{% endif %}
- "traefik.http.services.{{ genus_species }}-jbrowse.loadbalancer.server.port=80"
@@ -265,13 +265,13 @@ services:
- {{ genus_species }}
deploy:
labels:
- - "traefik.http.routers.{{ genus_species }}-galaxy.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/galaxy`))"
+ - "traefik.http.routers.{{ genus_species }}-blast.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/blast`))"
{% if https_port is defined %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.tls=true"
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs"
+ - "traefik.http.routers.{{ genus_species }}-blast.tls=true"
+ - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=webs"
- "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
{% else %}
- - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web"
+ - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=web"
- "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-app-trailslash,sp-app-prefix" # lg
{% endif %}
- "traefik.http.services.{{ genus_species }}-blast.loadbalancer.server.port=80"
@@ -313,11 +313,11 @@ services:
# - {{ genus_species }}
# deploy:
# labels:
-# - "traefik.http.routers.{{ genus_species }}-blast.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/blast`))"
-# - "traefik.http.routers.{{ genus_species }}-blast.tls=true"
-# - "traefik.http.routers.{{ genus_species }}-blast.entryPoints={{ entrypoint }}"
-# - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
-# - "traefik.http.services.{{ genus_species }}-blast.loadbalancer.server.port=80"
+# - "traefik.http.routers.{{ genus_species }}-wiki.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/{{ genus_species }}/wiki`))"
+# - "traefik.http.routers.{{ genus_species }}-wiki.tls=true"
+# - "traefik.http.routers.{{ genus_species }}-wiki.entryPoints={{ entrypoint }}"
+# - "traefik.http.routers.{{ genus_species }}-wiki.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
+# - "traefik.http.services.{{ genus_species }}-wiki.loadbalancer.server.port=80"
# restart_policy:
# condition: on-failure
# delay: 5s
--
GitLab