Skip to content

Commit

Permalink
update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
hexylena committed May 10, 2018
1 parent da1a608 commit b4bd972
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
13 changes: 10 additions & 3 deletions config/galaxy.yml.sample
Expand Up @@ -1292,7 +1292,8 @@ galaxy:
# correct user show up. This makes less sense on large public Galaxy
# instances where that data shouldn't be exposed. For semi-public
# Galaxies, it may make sense to expose just the username and not
# email, or vice versa.
# email, or vice versa. If gdpr_compliance_mode is set to True, then
# this option will be overridden and set to False.
#expose_user_name: false

# Expose user list. Setting this to True will expose the user list to
Expand All @@ -1301,7 +1302,8 @@ galaxy:
# correct user show up. This makes less sense on large public Galaxy
# instances where that data shouldn't be exposed. For semi-public
# Galaxies, it may make sense to expose just the username and not
# email, or vice versa.
# email, or vice versa. If gdpr_compliance_mode is set to True, then
# this option will be overridden and set to False.
#expose_user_email: false

# Whitelist for local network addresses for "Upload from URL" dialog.
Expand All @@ -1316,7 +1318,12 @@ galaxy:

# Enables GDPR Compliance mode. This makes several changes to the way
# Galaxy logs and exposes data externally such as removing
# emails/usernames from logs and bug reports.
# emails/usernames from logs and bug reports. It also causes the
# delete user admin action to permanently redact their username and
# password, but not to delete data associated with the account as this
# is not currently easily implementable. You are responsible for
# removing the data from backups. This automatically disabled
# expose_user_email and expose_user_name
#gdpr_compliance_mode: false

# Enable the new interface for installing tools from Tool Shed via the
Expand Down
13 changes: 10 additions & 3 deletions doc/source/admin/galaxy_options.rst
Expand Up @@ -2693,7 +2693,8 @@
have the correct user show up. This makes less sense on large
public Galaxy instances where that data shouldn't be exposed. For
semi-public Galaxies, it may make sense to expose just the
username and not email, or vice versa.
username and not email, or vice versa. If gdpr_compliance_mode is
set to True, then this option will be overridden and set to False.
:Default: ``false``
:Type: bool

Expand All @@ -2709,7 +2710,8 @@
have the correct user show up. This makes less sense on large
public Galaxy instances where that data shouldn't be exposed. For
semi-public Galaxies, it may make sense to expose just the
username and not email, or vice versa.
username and not email, or vice versa. If gdpr_compliance_mode is
set to True, then this option will be overridden and set to False.
:Default: ``false``
:Type: bool

Expand Down Expand Up @@ -2738,7 +2740,12 @@
:Description:
Enables GDPR Compliance mode. This makes several changes to the
way Galaxy logs and exposes data externally such as removing
emails/usernames from logs and bug reports.
emails/usernames from logs and bug reports. It also causes the
delete user admin action to permanently redact their username and
password, but not to delete data associated with the account as
this is not currently easily implementable. You are responsible
for removing the data from backups. This automatically disabled
expose_user_email and expose_user_name
:Default: ``false``
:Type: bool

Expand Down
8 changes: 5 additions & 3 deletions lib/galaxy/webapps/galaxy/config_schema.yml
Expand Up @@ -2046,9 +2046,11 @@ mapping:
Enables GDPR Compliance mode. This makes several changes to the way
Galaxy logs and exposes data externally such as removing
emails/usernames from logs and bug reports. It also causes the delete
user admin action to permanently delete all information stored on a
user, removing all related rows from the database. (You are
responsible for removing the data from backups.)
user admin action to permanently redact their username and password,
but not to delete data associated with the account as this is not
currently easily implementable.
You are responsible for removing the data from backups.
This automatically disabled expose_user_email and expose_user_name
Expand Down

0 comments on commit b4bd972

Please sign in to comment.