From ad743e3e0f20fb6a86f7ed57f718a90260300338 Mon Sep 17 00:00:00 2001
From: Arthur Le Bars <arthur.le-bars@sb-roscoff.fr>
Date: Mon, 22 Mar 2021 15:41:32 +0100
Subject: [PATCH] jinja2 template syntax error fix
---
templates/gspecies_compose_template.yml.j2 | 8 ++++----
templates/traefik_compose_template.yml.j2 | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/templates/gspecies_compose_template.yml.j2 b/templates/gspecies_compose_template.yml.j2
index 9963b5e..765886b 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 396a904..5b2b144 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"
--
GitLab