mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-28 02:58:18 +08:00
Merge pull request #7247 from nsoranzo/unneeded_conditional_reqs
Remove unneeded conditional requirements
This commit is contained in:
Dannon
@@ -599,8 +599,7 @@ galaxy:
|
||||
|
||||
# Activation grace period (in hours). Activation is not forced (login
|
||||
# is not disabled) until grace period has passed. Users under grace
|
||||
# period can't run jobs. Enter 0 to disable grace period. Users with
|
||||
# OpenID logins have grace period forever.
|
||||
# period can't run jobs. Enter 0 to disable grace period.
|
||||
#activation_grace_period: 3
|
||||
|
||||
# Shown in warning box to users that were not activated yet. In use
|
||||
@@ -1428,18 +1427,6 @@ galaxy:
|
||||
# particular history
|
||||
#history_local_serial_workflow_scheduling: false
|
||||
|
||||
# Enable authentication via OpenID. Allows users to log in to their
|
||||
# Galaxy account by authenticating with an OpenID provider.
|
||||
#enable_openid: false
|
||||
|
||||
# If OpenID is enabled, this configuration file specifies providers to
|
||||
# use. Falls back to the .sample variant in config if default does not
|
||||
# exist.
|
||||
#openid_config_file: config/openid_conf.xml
|
||||
|
||||
# If OpenID is enabled, consumer cache directory to use.
|
||||
#openid_consumer_cache_path: database/openid_consumer_cache
|
||||
|
||||
# Enables and disables OpenID Connect (OIDC) support.
|
||||
#enable_oidc: false
|
||||
|
||||
|
||||
@@ -351,10 +351,6 @@ tool_shed:
|
||||
# will not clobber each other.
|
||||
#cookie_path: null
|
||||
|
||||
# Enable authentication via OpenID. Allows users to log in to their
|
||||
# Galaxy account by authenticating with an OpenID provider.
|
||||
#enable_openid: false
|
||||
|
||||
# Turn on logging of user actions to the database. Actions currently
|
||||
# logged are grid views, tool searches, and use of "recently" used
|
||||
# tools menu. The log_events and log_actions functionality will
|
||||
|
||||
@@ -5,7 +5,6 @@ Galaxy supports the following authentication mechanisms:
|
||||
* [Galaxy Database](#galaxy-database) - Galaxy-specific login using e-mail address and password (the default);
|
||||
* [OIDC and OAuth2.0](#OIDC-and-OAuth2.0) - Login to Galaxy using your Google account, without having to create a Galaxy user;
|
||||
* [Authentication Framework](#authentication-framework) - A plugin-driven framework supporting LDAP/Active Directory and PAM;
|
||||
* [OpenID](#openid) - authentication with Galaxy as a relying party;
|
||||
* [Proxy Authentication](#proxy_authentication) - HTTP [remote user](http://httpd.apache.org/docs/current/mod/mod_cgi.html#env) provided by any front-end Web server.
|
||||
|
||||
## Galaxy Database
|
||||
@@ -38,16 +37,6 @@ To configure one or more authentication plugins, simply copy ``config/auth_conf.
|
||||
The provided sample configuration file has numerous commented out examples and serves as the most up-to-date source
|
||||
of documentation on configuring these plugins.
|
||||
|
||||
## OpenID
|
||||
|
||||
[OpenID](https://en.wikipedia.org/wiki/OpenID) is becoming less popular and probably shouldn't be used the primary mechanism
|
||||
for authentication in Galaxy but it is an available option.
|
||||
|
||||
Enabling OpenID requires you to edit Galaxy's configuration file and set `enable_openid` to `true`. This file is
|
||||
likely located in `config/galaxy.yml` and can be created by copying Galaxy's sample `config/galaxy.yml.sample`.
|
||||
|
||||
Enabling this option enables OpenID and causes the OpenID form to be displayed on the login screen.
|
||||
|
||||
## Remote User Authentication
|
||||
|
||||
If Galaxy is deployed with either nginx or Apache serving as a front-end proxy for Galaxy requests, they can be configured
|
||||
|
||||
@@ -75,8 +75,6 @@ Additional configuration files and their purposes are:
|
||||
used by users to control runtime parameters such as memory allocations, cluster selection, and so forth.
|
||||
- ``object_store_conf.xml``: Configures more advanced storage paradigms for Galaxy datasets, including layout across
|
||||
multiple filesystems, or in object storage systems such as Swift or Amazon S3.
|
||||
- ``openid_conf.xml``: Controls which OpenID (if enabled) providers should be presented as options to the user on the
|
||||
login form.
|
||||
- ``swarm_manager_conf.yml``: Configures the experimental Docker Swarm manager.
|
||||
- ``tool_destinations.yml``: Configures dynamic tool destinations, which allow for mapping tools to job destinations
|
||||
based on certain runtime job properties, such as the user submitting it, input sizes, and so forth.
|
||||
|
||||
@@ -1107,7 +1107,7 @@
|
||||
Activation grace period (in hours). Activation is not forced
|
||||
(login is not disabled) until grace period has passed. Users
|
||||
under grace period can't run jobs. Enter 0 to disable grace
|
||||
period. Users with OpenID logins have grace period forever.
|
||||
period.
|
||||
:Default: ``3``
|
||||
:Type: int
|
||||
|
||||
@@ -2952,39 +2952,6 @@
|
||||
:Type: bool
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~
|
||||
``enable_openid``
|
||||
~~~~~~~~~~~~~~~~~
|
||||
|
||||
:Description:
|
||||
Enable authentication via OpenID. Allows users to log in to their
|
||||
Galaxy account by authenticating with an OpenID provider.
|
||||
:Default: ``false``
|
||||
:Type: bool
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~
|
||||
``openid_config_file``
|
||||
~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
:Description:
|
||||
If OpenID is enabled, this configuration file specifies providers
|
||||
to use. Falls back to the .sample variant in config if default
|
||||
does not exist.
|
||||
:Default: ``config/openid_conf.xml``
|
||||
:Type: str
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
``openid_consumer_cache_path``
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
:Description:
|
||||
If OpenID is enabled, consumer cache directory to use.
|
||||
:Default: ``database/openid_consumer_cache``
|
||||
:Type: str
|
||||
|
||||
|
||||
~~~~~~~~~~~~~~~
|
||||
``enable_oidc``
|
||||
~~~~~~~~~~~~~~~
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
galaxy\.openid package
|
||||
======================
|
||||
|
||||
.. automodule:: galaxy.openid
|
||||
:members:
|
||||
:undoc-members:
|
||||
:show-inheritance:
|
||||
|
||||
Submodules
|
||||
----------
|
||||
|
||||
galaxy\.openid\.providers module
|
||||
--------------------------------
|
||||
|
||||
.. automodule:: galaxy.openid.providers
|
||||
:members:
|
||||
:undoc-members:
|
||||
:show-inheritance:
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ Subpackages
|
||||
galaxy.managers
|
||||
galaxy.model
|
||||
galaxy.objectstore
|
||||
galaxy.openid
|
||||
galaxy.quota
|
||||
galaxy.security
|
||||
galaxy.tools
|
||||
|
||||
@@ -33,14 +33,6 @@ galaxy\.web\.framework\.decorators module
|
||||
:undoc-members:
|
||||
:show-inheritance:
|
||||
|
||||
galaxy\.web\.framework\.openid\_manager module
|
||||
----------------------------------------------
|
||||
|
||||
.. automodule:: galaxy.web.framework.openid_manager
|
||||
:members:
|
||||
:undoc-members:
|
||||
:show-inheritance:
|
||||
|
||||
galaxy\.web\.framework\.webapp module
|
||||
-------------------------------------
|
||||
|
||||
|
||||
@@ -130,9 +130,6 @@ class ConditionalDependencies(object):
|
||||
def check_azure_storage(self):
|
||||
return 'azure_blob' in self.object_stores
|
||||
|
||||
def check_cloudbridge(self):
|
||||
return 'cloud' in self.object_stores
|
||||
|
||||
def check_kamaki(self):
|
||||
return 'pithos' in self.object_stores
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# These dependencies are only required when certain config options are set
|
||||
psycopg2-binary==2.7.4
|
||||
weberror==0.10.3
|
||||
python-openid
|
||||
mysql-python
|
||||
fluent-logger
|
||||
raven
|
||||
@@ -13,7 +12,6 @@ azure-storage==0.32.0
|
||||
# PyRods not in PyPI
|
||||
python-ldap==2.4.44
|
||||
python-pam
|
||||
cloudbridge==1.0.1
|
||||
galaxycloudrunner
|
||||
|
||||
# Chronos client
|
||||
|
||||
Reference in New Issue
Block a user