Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gga_load_data
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
abims
e-infra
gga_load_data
Commits
caebe444
Commit
caebe444
authored
3 years ago
by
Romain Dallet
Browse files
Options
Downloads
Patches
Plain Diff
Fix some middlewares and add env var BASE_URL_PROTO
parent
aefc4efe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!36
Release v2.2.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
templates/gspecies_compose.yml.j2
+6
-5
6 additions, 5 deletions
templates/gspecies_compose.yml.j2
templates/traefik_compose.yml.j2
+2
-2
2 additions, 2 deletions
templates/traefik_compose.yml.j2
with
8 additions
and
7 deletions
templates/gspecies_compose.yml.j2
+
6
−
5
View file @
caebe444
...
...
@@ -57,6 +57,7 @@ services:
environment:
DB_HOST: tripal-db.{{ genus_species }}
BASE_URL_PATH: /sp/{{ genus_species }}
BASE_URL_PROTO: "https"
UPLOAD_LIMIT: 20M
MEMORY_LIMIT: 512M
TRIPAL_GIT_CLONE_MODULES: "https://github.com/abretaud/tripal_rest_api.git[@c6f9021ea5d4c6d7c67c5bd363a7dd9359228bbc] https://github.com/tripal/tripal_elasticsearch.git[@dc7f276046e394a80a7dfc9404cf1a149006eb2a] https://github.com/tripal/tripal_analysis_interpro.git https://github.com/tripal/tripal_analysis_go.git https://github.com/tripal/tripal_analysis_blast.git https://github.com/tripal/tripal_analysis_expression.git[@7240039fdeb4579afd06bbcb989cb7795bd4c342]"
...
...
@@ -86,13 +87,13 @@ services:
- "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-
app-
trailslash,sp-prefix,tripal-addprefix"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
{% else %}
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-
app-
trailslash,sp-prefix,tripal-addprefix"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix"
{% endif %}
{% else %}
- "traefik.http.routers.{{ genus_species }}-tripal.entryPoints=web"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-
app-
trailslash,sp-prefix,tripal-addprefix"
- "traefik.http.routers.{{ genus_species }}-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix"
{% endif %}
- "traefik.http.services.{{ genus_species }}-tripal.loadbalancer.server.port=80"
restart_policy:
...
...
@@ -274,9 +275,9 @@ services:
- "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-auth,sp-app-trailslash,sp-prefix"
- "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-app-trailslash,sp-prefix"
- "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"
...
...
This diff is collapsed.
Click to expand it.
templates/traefik_compose.yml.j2
+
2
−
2
View file @
caebe444
...
...
@@ -48,10 +48,10 @@ services:
# Some generally useful middlewares for organisms hosting
{% if authelia_config_path is defined %}
- "traefik.http.middlewares.sp-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://{{ authentication_domain_name }}/"
{% endif %}
{% if https_port is defined %}
- "traefik.http.middlewares.sp-auth.forwardauth.trustForwardHeader=true"
- "traefik.http.middlewares.sp-auth.forwardauth.authResponseHeaders=Remote-User,Remote-Groups"
{% endif %}
{% if https_port is defined %}
- "traefik.http.middlewares.sp-trailslash.redirectregex.regex=^(https?://[^/]+/sp/[^/]+)$$"
{% else %}
- "traefik.http.middlewares.sp-trailslash.redirectregex.regex=^(http?://[^/]+/sp/[^/]+)$$"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment