From 5d063f27f8d86c2b95309e1fa5a0f0ce6ae605dd Mon Sep 17 00:00:00 2001 From: Loraine Gueguen <loraine.gueguen@sb-roscoff.fr> Date: Mon, 31 May 2021 10:47:09 +0200 Subject: [PATCH] Add GALAXY_DEFAULT_ADMIN_KEY to galaxy service env variable --- constants.py | 1 + examples/config.yml | 1 + templates/gspecies_compose.yml.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/constants.py b/constants.py index cfe86b2..4fea991 100644 --- a/constants.py +++ b/constants.py @@ -39,6 +39,7 @@ CONF_ALL_AUTHELIA_DB_POSTGRES_PASSWORD = "authelia_db_postgres_password" CONF_GALAXY_DEFAULT_ADMIN_EMAIL = "galaxy_default_admin_email" CONF_GALAXY_DEFAULT_ADMIN_USER = "galaxy_default_admin_user" CONF_GALAXY_DEFAULT_ADMIN_PASSWORD = "galaxy_default_admin_password" +CONF_GALAXY_DEFAULT_ADMIN_KEY = "galaxy_default_admin_key" CONF_GALAXY_CONFIG_REMOTE_USER_MAILDOMAIN = "galaxy_config_remote_user_maildomain" CONF_GALAXY_PERSIST_DATA = "galaxy_persist_data" CONF_TRIPAL_PASSWORD = "tripal_password" diff --git a/examples/config.yml b/examples/config.yml index ed028cb..695ab03 100644 --- a/examples/config.yml +++ b/examples/config.yml @@ -14,6 +14,7 @@ authelia_db_postgres_password: psqlpwd # Required for Authelia. galaxy_default_admin_email: gga@galaxy.org # Required galaxy_default_admin_user: gga # Required galaxy_default_admin_password: password # Required +galaxy_default_admin_key: myfakekey # Required galaxy_config_remote_user_maildomain: mydomain.com # Required. The maildomain used by Galaxy authentication galaxy_persist_data: "True" # Optional (default: True). If False, docker data will NOT be persisted on your host's file system and will be lost any time the galaxy container is recreated. Do not set this variable to "False" for production diff --git a/templates/gspecies_compose.yml.j2 b/templates/gspecies_compose.yml.j2 index 4651cf4..4c9848e 100644 --- a/templates/gspecies_compose.yml.j2 +++ b/templates/gspecies_compose.yml.j2 @@ -143,6 +143,7 @@ services: 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 }}" GALAXY_CONFIG_ADMIN_USERS: "admin@galaxy.org,{{ galaxy_default_admin_email }}" # admin@galaxy.org is the default (leave it), galaxy_default_admin_email is a shared ldap user we use to connect ENABLE_FIX_PERMS: 0 PROXY_PREFIX: /sp/{{ genus_species }}/galaxy -- GitLab