diff --git a/templates/gspecies_compose_template.yml.j2 b/templates/gspecies_compose_template.yml.j2 index 9963b5e866a41cd350315b8cd0f468cf57ad6b93..765886b75d0d14c58e24b5ba2279b6d27f5301e2 100644 --- a/templates/gspecies_compose_template.yml.j2 +++ b/templates/gspecies_compose_template.yml.j2 @@ -56,18 +56,18 @@ services: ENABLE_JBROWSE: /jbrowse/?data=data/{{ genus_species_sex }} # This ENABLE_JBROWSE variable should point to the "best assembly" by default --> tag it in the input file and use it to define this variable correctly (also called # unique id in the jbrowse tool parameters == both have to be identical) - {% if apollo == "True %} + {% if apollo == True %} ENABLE_APOLLO: 1 {% else %} ENABLE_APOLLO: 0 {% endif %} - {% if blast == "True" %} + {% if blast == True %} ENABLE_BLAST: 1 {% else %} ENABLE_BLAST: 0 {% endif %} ENABLE_DOWNLOAD: 1 - {% if wiki == "True" %} + {% if wiki == True %} ENABLE_WIKI: 1 {% else %} ENABLE_WIKI: 0 @@ -221,7 +221,7 @@ services: max_attempts: 3 window: 120s - {% if blast == "True" %} + {% if blast == True %} blast: image: quay.io/abretaud/sf-blast:latest depends_on: diff --git a/templates/traefik_compose_template.yml.j2 b/templates/traefik_compose_template.yml.j2 index 396a904aa703514e9f0f3aaaa8e815f16274f140..5b2b1440c369f26fdfb68c51ac8caadb941cefd1 100644 --- a/templates/traefik_compose_template.yml.j2 +++ b/templates/traefik_compose_template.yml.j2 @@ -19,7 +19,7 @@ services: - {{ dashboard_port }}:8080 # added by lg to debug, for dashboard {% endif %} - {{ http_port }}:80 - {% if if https_port is defined %} + {% if https_port is defined %} - {{ https_port }}:443 {% endif %} networks: @@ -37,7 +37,7 @@ services: - "traefik.http.routers.traefik-api.tls=true" - "traefik.http.routers.traefik-api.entryPoints=webs" {% else %} - - "traefik.http.routers.traefik-api.entryPoints={{ entrypoint }}" # lg + - "traefik.http.routers.traefik-api.entryPoints=web" # lg {% endif %} - "traefik.http.routers.traefik-api.service=api@internal" - "traefik.http.middlewares.traefik-strip.stripprefix.prefixes=/traefik"