WIP: Orthology module

templates/orthology_compose.yml.j2

@@ -28,9 +28,9 @@ services:
             # Must match the SITE_NAME in the gcv part
             GCV_SITE_NAME: "example"
             # Use this to point to the external adress of your main tripal host
-            MAIN_TRIPAL_URL: "http://{{ hostname }}"
-            #THEME: "{{ tripal_theme_name }}"    # Use this to use another theme
-            #THEME_GIT_CLONE: "{{ tripal_theme_git_clone }}"    # Use this to install another theme
+            MAIN_TRIPAL_URL: "http://localhost"
+            THEME: "{{ tripal_theme_name }}"  # Use this to use another theme
+            THEME_GIT_CLONE: "{{ tripal_theme_git_clone }}"  # Use this to install another theme
             ADMIN_PASSWORD: {{ tripal_password }}  # You need to define it and update it in galaxy config below
         networks:
             - traefikbig
@@ -38,10 +38,15 @@ services:
         deploy:
           labels:
             - "traefik.http.routers.orthology-tripal.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/orthology`))"
-            - "traefik.http.routers.orthology-tripal.tls=true"
-            - "traefik.http.routers.orthology-tripal.entryPoints=webs"
-            - "traefik.http.routers.orthology-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
-            - "traefik.http.services.orthology-tripal.loadbalancer.server.port=80"
+              {% if https_port is defined and https_port %}
+                  - "traefik.http.routers.orthology-tripal.tls=true"
+                  - "traefik.http.routers.orthology-tripal.entryPoints=webs"
+                  - "traefik.http.routers.orthology-tripal.middlewares=sp-auth,sp-trailslash,sp-prefix,tripal-addprefix"
+              {% else %}
+                  - "traefik.http.routers.orthology-tripal.entryPoints=web"
+                  - "traefik.http.routers.orthology-tripal.middlewares=sp-trailslash,sp-prefix,tripal-addprefix"
+              {% endif %}
+                  - "traefik.http.services.orthology-tripal.loadbalancer.server.port=80"
           restart_policy:
             condition: on-failure
             delay: 5s
@@ -68,8 +73,8 @@ services:
         environment:
             DB_HOST: tripal-db.orthology
             HOST: {{ hostname }}
-            SITE_NAME: example
-            SITE_FULL_NAME: example
+            SITE_NAME: Phaeoexplorer GGA orthology
+            SITE_FULL_NAME: Phaeoexplorer GGA orthology
             DEBUG: "false"
             GCV_URL: http://{{ hostname }}/sp/orthology/gcv
             SERVICES_URL: http://{{ hostname }}/sp/orthology/gcv_api/services
@@ -80,14 +85,15 @@ services:
             - orthology
         deploy:
           labels:
+            # GCV routers
             - "traefik.http.routers.orthology-gcv.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/orthology/gcv`))"
             - "traefik.http.routers.orthology-gcv.tls=true"
             - "traefik.http.routers.orthology-gcv.entryPoints=webs"
             - "traefik.http.routers.orthology-gcv.service=orthology-gcv"
             - "traefik.http.routers.orthology-gcv.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
             - "traefik.http.services.orthology-gcv.loadbalancer.server.port=80"
-
-            - "traefik.http.routers.orthology-gcv-api.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/orthology/gcv_api`))"
+            # GCV API routers
+            - "traefik.http.routers.orthology-gcv-api.rule=(Host(`localhost`) && PathPrefix(`/sp/orthology/gcv_api`))"
             - "traefik.http.routers.orthology-gcv-api.tls=true"
             - "traefik.http.routers.orthology-gcv-api.entryPoints=webs"
             - "traefik.http.routers.orthology-gcv-api.service=orthology-gcv-api"
@@ -112,8 +118,11 @@ services:
             GALAXY_CONFIG_BRAND: "Orthology"
             GALAXY_CONFIG_ALLOW_LIBRARY_PATH_PASTE: "True"
             GALAXY_CONFIG_USE_REMOTE_USER: "True"
-            GALAXY_CONFIG_REMOTE_USER_MAILDOMAIN: "bipaa"
-            GALAXY_CONFIG_ADMIN_USERS: "admin@galaxy.org,gogepp@bipaa"   # admin@galaxy.org is the default (leave it), gogepp@bipaa is a shared ldap user we use to connect
+            GALAXY_CONFIG_REMOTE_USER_MAILDOMAIN: "{{ galaxy_config_remote_user_maildomain }}"
+            GALAXY_DEFAULT_ADMIN_EMAIL: "{{ galaxy_default_admin_email }}"
+            GALAXY_DEFAULT_ADMIN_USER: "{{ galaxy_default_admin_user }}"
+            GALAXY_DEFAULT_ADMIN_PASSWORD: "{{ galaxy_default_admin_password }}"
+            GALAXY_DEFAULT_ADMIN_KEY: "{{ galaxy_default_admin_key }}"
             ENABLE_FIX_PERMS: 0
             PROXY_PREFIX: /sp/orthology/galaxy
             GALAXY_TRIPAL_URL: http://tripal.orthology/tripal/
@@ -131,10 +140,18 @@ services:
         deploy:
           labels:
             - "traefik.http.routers.orthology-galaxy.rule=(Host(`{{ hostname }}`) && PathPrefix(`/sp/orthology/galaxy`))"
+            {% if https_port is defined and https_port %}
             - "traefik.http.routers.orthology-galaxy.tls=true"
             - "traefik.http.routers.orthology-galaxy.entryPoints=webs"
             - "traefik.http.routers.orthology-galaxy.middlewares=sp-auth,sp-app-trailslash,sp-app-prefix"
+            {% else %}
+            - "traefik.http.routers.orthology-galaxy.entryPoints=web"
+            - "traefik.http.routers.orthology-galaxy.middlewares=sp-app-trailslash,sp-app-prefix"
+            {% endif %}
             - "traefik.http.services.orthology-galaxy.loadbalancer.server.port=80"
+            - "traefik.http.routers.orthology-gga_load-galaxy.rule=(Host(`localhost`) && PathPrefix(`/sp/orthology/galaxy`))"
+            - "traefik.http.routers.orthology-gga_load-galaxy.entryPoints=web"
+            - "traefik.http.routers.orthology-gga_load-galaxy.middlewares=sp-app-trailslash,sp-app-prefix"
           restart_policy:
             condition: on-failure
             delay: 5s