Fix templates https and authelia conditions

templates/gspecies_compose.yml.j2

@@ -17,13 +17,12 @@ services:
             {% if https_port is defined and https_port %}
             - "traefik.http.routers.{{ genus_species }}-nginx.tls=true"
             - "traefik.http.routers.{{ genus_species }}-nginx.entryPoints=webs"
-                {% if authelia_config_path is defined %}
-            - "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-auth,sp-app-trailslash,sp-prefix"
-                {% else %}
-            - "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-app-trailslash,sp-prefix"
-                {% endif %}
             {% else %}
             - "traefik.http.routers.{{ genus_species }}-nginx.entryPoints=web"
+            {% endif %}
+            {% if https_port is defined and https_port and authelia_config_path is defined and authelia_config_path %}
+            - "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-auth,sp-app-trailslash,sp-prefix"
+            {% else %}            
             - "traefik.http.routers.{{ genus_species }}-nginx.middlewares=sp-app-trailslash,sp-prefix"
             {% endif %}
             - "traefik.http.services.{{ genus_species }}-nginx.loadbalancer.server.port=80"
@@ -88,13 +87,12 @@ services:
             {% if https_port is defined and https_port %}
             - "traefik.http.routers.{{ genus_species }}-tripal.tls=true"
             - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=webs"
-                {% if authelia_config_path is defined %}
-            - "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
-                {% else %}
-            - "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix"
-                {% endif %}
             {% else %}
             - "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=web"
+            {% endif %}
+            {% if https_port is defined and https_port and authelia_config_path is defined and authelia_config_path %}
+            - "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
+            {% else %}
             - "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix"
             {% endif %}
             - "traefik.http.services.{{ genus_species }}-tripal.loadbalancer.server.port=80"
@@ -177,13 +175,12 @@ services:
             {% if https_port is defined and https_port %}
             - "traefik.http.routers.{{ genus_species }}-galaxy.tls=true"
             - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=webs"
-                {% if authelia_config_path is defined %}
-            - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
-                {% else %}
-            - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-app-trailslash,sp-app-prefix"
-                {% endif %}
             {% else %}
             - "traefik.http.routers.{{ genus_species }}-galaxy.entryPoints=web"
+            {% endif %}
+            {% if https_port is defined and https_port and authelia_config_path is defined and authelia_config_path %}
+            - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
+            {% else %}
             - "traefik.http.routers.{{ genus_species }}-galaxy.middlewares=sp-app-trailslash,sp-app-prefix"
             {% endif %}
             - "traefik.http.services.{{ genus_species }}-galaxy.loadbalancer.server.port=80"
@@ -212,13 +209,12 @@ services:
             {% if https_port is defined and https_port %}
             - "traefik.http.routers.{{ genus_species }}-jbrowse.tls=true"
             - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=webs"
-                {% if authelia_config_path is defined %}
-            - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
-                {% else %}
-            - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-app-trailslash,sp-app-prefix"
-                {% endif %}
             {% else %}
             - "traefik.http.routers.{{ genus_species }}-jbrowse.entryPoints=web"
+            {% endif %}
+            {% if https_port is defined and https_port and authelia_config_path is defined and authelia_config_path %}
+            - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
+            {% else %}
             - "traefik.http.routers.{{ genus_species }}-jbrowse.middlewares=sp-app-trailslash,sp-app-prefix"
             {% endif %}
             - "traefik.http.services.{{ genus_species }}-jbrowse.loadbalancer.server.port=80"
@@ -276,13 +272,12 @@ services:
             {% if https_port is defined and https_port %}
             - "traefik.http.routers.{{ genus_species }}-blast.tls=true"
             - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=webs"
-                {% if authelia_config_path is defined %}
-            - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-prefix"
-                {% else %}
-            - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-app-trailslash,sp-prefix"
-                {% endif %}
             {% else %}
             - "traefik.http.routers.{{ genus_species }}-blast.entryPoints=web"
+            {% endif %}
+            {% if https_port is defined and https_port and authelia_config_path is defined and authelia_config_path %}
+            - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-auth,sp-app-trailslash,sp-app-prefix"
+            {% else %}
             - "traefik.http.routers.{{ genus_species }}-blast.middlewares=sp-big-req,sp-app-trailslash,sp-app-prefix"
             {% endif %}
             - "traefik.http.services.{{ genus_species }}-blast.loadbalancer.server.port=80"

templates/traefik_compose.yml.j2

@@ -36,7 +36,7 @@ services:
         {% endif %}
         - "traefik.http.routers.traefik-api.service=api@internal"
         - "traefik.http.middlewares.traefik-strip.stripprefix.prefixes=/traefik"
-        {% if authelia_config_path is defined %}
+        {% if https_port is defined and authelia_config_path is defined %}
         - "traefik.http.middlewares.traefik-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://{{ authentication_domain_name }}/"
         - "traefik.http.middlewares.traefik-auth.forwardauth.trustForwardHeader=true"
         - "traefik.http.routers.traefik-api.middlewares=traefik-auth,traefik-strip"
@@ -46,7 +46,7 @@ services:
         # Dummy service for Swarm port detection. The port can be any valid integer value.
         - "traefik.http.services.traefik-svc.loadbalancer.server.port=9999"
         # Some generally useful middlewares for organisms hosting
-        {% if authelia_config_path is defined %}
+        {% if https_port is defined and authelia_config_path is defined %}
         - "traefik.http.middlewares.sp-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://{{ authentication_domain_name }}/"
         - "traefik.http.middlewares.sp-auth.forwardauth.trustForwardHeader=true"
         - "traefik.http.middlewares.sp-auth.forwardauth.authResponseHeaders=Remote-User,Remote-Groups"
@@ -76,7 +76,7 @@ services:
         max_attempts: 3
         window: 120s
 
-  {% if authelia_config_path is defined %}
+  {% if https_port is defined and authelia_config_path is defined %}
   authelia:
     image: authelia/authelia:4.12.0
     networks: