rename main variable

lib/galaxy/config.py

@@ -691,8 +691,8 @@ def __init__(self, **kwargs):
         self.redact_user_address_during_deletion = False
         # GDPR compliance mode changes values on a number of variables. Other
         # policies could change (non)overlapping subsets of these variables.
-        self.gdpr_compliance_mode = string_as_bool(kwargs.get("gdpr_compliance_mode", False))
-        if self.gdpr_compliance_mode:
+        self.gdpr_compliance = string_as_bool(kwargs.get("gdpr_compliance", False))
+        if self.gdpr_compliance:
             self.expose_user_name = False
             self.expose_user_email = False
 

lib/galaxy/webapps/galaxy/config_schema.yml

@@ -2008,7 +2008,7 @@ mapping:
           shouldn't be exposed.  For semi-public Galaxies, it may make sense to expose
           just the username and not email, or vice versa.
 
-          If gdpr_compliance_mode is set to True, then this option will be
+          If gdpr_compliance is set to True, then this option will be
           overridden and set to False.
 
       expose_user_email:
@@ -2023,7 +2023,7 @@ mapping:
           shouldn't be exposed.  For semi-public Galaxies, it may make sense to expose
           just the username and not email, or vice versa.
 
-          If gdpr_compliance_mode is set to True, then this option will be
+          If gdpr_compliance is set to True, then this option will be
           overridden and set to False.
 
       fetch_url_whitelist:
@@ -2038,22 +2038,25 @@ mapping:
           It should be a comma separated list of IP addresses or IP address/mask, e.g.
           10.10.10.10,10.0.1.0/24,fd00::/8
 
-      gdpr_compliance_mode:
+      gdpr_compliance:
         type: bool
         default: false
         required: false
         desc: |
           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 redact their username and password,
-          but not to delete data associated with the account as this is not
+          Galaxy logs and exposes data externally such as removing emails and
+          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 personal data from backups.
 
-          This automatically disabled expose_user_email and expose_user_name
+          This forces expose_user_email and expose_user_name to be false, and
+          forces user_deletion to be true to support the right to erasure.
 
+          Please read the GDPR section under the special topics area of the
+          admin documentation.
       enable_beta_ts_api_install:
         type: bool
         default: true
@@ -2695,4 +2698,3 @@ mapping:
         required: false
         desc: |
           persistent_communication_rooms is a comma-separated list of rooms that should be always available.
-

lib/galaxy/webapps/reports/config.py

@@ -55,8 +55,8 @@ def __init__(self, **kwargs):
         # Security/Policy Compliance
         self.redact_username_in_logs = False
         self.redact_email_in_job_name = False
-        self.gdpr_compliance_mode = string_as_bool(kwargs.get("gdpr_compliance_mode", False))
-        if self.gdpr_compliance_mode:
+        self.gdpr_compliance = string_as_bool(kwargs.get("gdpr_compliance", False))
+        if self.gdpr_compliance:
             self.redact_username_in_logs = True
             self.redact_email_in_job_name = True
 

lib/galaxy/webapps/reports/config_schema.yml

@@ -102,7 +102,7 @@ mapping:
         desc: |
           Mail
 
-      gdpr_compliance_mode:
+      gdpr_compliance:
         type: bool
         default: false
         required: false
@@ -112,3 +112,6 @@ mapping:
           emails/usernames from logs and bug reports.
 
           You are responsible for removing personal data from backups.
+
+          Please read the GDPR section under the special topics area of the
+          admin documentation.

lib/galaxy/webapps/tool_shed/config.py

@@ -146,8 +146,8 @@ def __init__(self, **kwargs):
         self.redact_username_during_deletion = False
         self.redact_email_during_deletion = False
         self.redact_username_in_logs = False
-        self.gdpr_compliance_mode = string_as_bool(kwargs.get("gdpr_compliance_mode", False))
-        if self.gdpr_compliance_mode:
+        self.gdpr_compliance = string_as_bool(kwargs.get("gdpr_compliance", False))
+        if self.gdpr_compliance:
             self.redact_username_during_deletion = True
             self.redact_email_during_deletion = True
             self.redact_username_in_logs = True

lib/galaxy/webapps/tool_shed/config_schema.yml

@@ -430,7 +430,7 @@ mapping:
         desc: |
           Serving static files (needed if running standalone)
 
-      gdpr_compliance_mode:
+      gdpr_compliance:
         type: bool
         default: false
         required: false
@@ -441,6 +441,9 @@ mapping:
 
           You are responsible for removing personal data from backups.
 
+          Please read the GDPR section under the special topics area of the
+          admin documentation.
+
       apache_xsendfile:
         type: bool
         default: false

test/unit/unittest_utils/galaxy_mock.py

@@ -132,7 +132,7 @@ def __init__(self, root=None, **kwargs):
 
         self.migrated_tools_config = "/tmp/migrated_tools_conf.xml"
         self.preserve_python_environment = "always"
-        self.gdpr_compliance_mode = False
+        self.gdpr_compliance = False
 
         # set by MockDir
         self.root = root