From d50be66a5966d2dbea195a859c223c3037cdc3ff Mon Sep 17 00:00:00 2001
From: Loraine Gueguen <loraine.gueguen@sb-roscoff.fr>
Date: Fri, 21 May 2021 09:25:39 +0200
Subject: [PATCH] fix typo in "galaxy_default_admin_user" config param
---
constants.py | 2 +-
examples/config.yml | 2 +-
templates/galaxy_nginx.conf.j2 | 2 +-
templates/gspecies_compose.yml.j2 | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/constants.py b/constants.py
index 2a50710..0eada7f 100644
--- a/constants.py
+++ b/constants.py
@@ -36,7 +36,7 @@ CONF_ALL_AUTHELIA_CONFIG_PATH = "authelia_config_path"
CONF_ALL_AUTHELIA_SECRETS_ENV_PATH = "authelia_secrets_env_path"
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_defaut_admin_user"
+CONF_GALAXY_DEFAULT_ADMIN_USER = "galaxy_default_admin_user"
CONF_GALAXY_DEFAULT_ADMIN_PASSWORD = "galaxy_default_admin_password"
CONF_GALAXY_CONFIG_REMOTE_USER_MAILDOMAIN = "galaxy_config_remote_user_maildomain"
CONF_GALAXY_PERSIST_DATA = "galaxy_persist_data"
diff --git a/examples/config.yml b/examples/config.yml
index cb08732..6c5a780 100644
--- a/examples/config.yml
+++ b/examples/config.yml
@@ -12,7 +12,7 @@ authelia_db_postgres_password: XXXXXXXX # Required for Authelia.
# galaxy-specific variables
galaxy_default_admin_email: gga@galaxy.org # Required
-galaxy_defaut_admin_user: gga # Required
+galaxy_default_admin_user: gga # Required
galaxy_default_admin_password: password # 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/galaxy_nginx.conf.j2 b/templates/galaxy_nginx.conf.j2
index 7920bef..4205c3d 100644
--- a/templates/galaxy_nginx.conf.j2
+++ b/templates/galaxy_nginx.conf.j2
@@ -15,4 +15,4 @@ uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_PORT $server_port;
uwsgi_param SERVER_NAME $server_name;
-uwsgi_param HTTP_REMOTE_USER {% if https_port is defined %}$http_remote_user if_not_empty;{% elif galaxy_defaut_admin_user is defined %}{{ galaxy_defaut_admin_user }};{% else %}$http_remote_user if_not_empty;{% endif %}
+uwsgi_param HTTP_REMOTE_USER {% if https_port is defined %}$http_remote_user if_not_empty;{% elif galaxy_default_admin_user is defined %}{{ galaxy_default_admin_user }};{% else %}$http_remote_user if_not_empty;{% endif %}
diff --git a/templates/gspecies_compose.yml.j2 b/templates/gspecies_compose.yml.j2
index 0ff9df0..4651cf4 100644
--- a/templates/gspecies_compose.yml.j2
+++ b/templates/gspecies_compose.yml.j2
@@ -141,7 +141,7 @@ services:
GALAXY_CONFIG_USE_REMOTE_USER: "True"
GALAXY_CONFIG_REMOTE_USER_MAILDOMAIN: "{{ galaxy_config_remote_user_maildomain }}"
GALAXY_DEFAULT_ADMIN_EMAIL: "{{ galaxy_default_admin_email }}"
- GALAXY_DEFAULT_ADMIN_USER: "{{ galaxy_defaut_admin_user }}"
+ GALAXY_DEFAULT_ADMIN_USER: "{{ galaxy_default_admin_user }}"
GALAXY_DEFAULT_ADMIN_PASSWORD: "{{ galaxy_default_admin_password }}"
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
--
GitLab